From 1bc923a2a0838269de64536cf62e51e63880d76e Mon Sep 17 00:00:00 2001
From: gangwu <gangwu@chromium.org>
Date: Wed, 8 Jun 2016 16:21:10 -0700
Subject: [PATCH] Make chrome sync response compression as default

BUG=509728

Review-Url: https://codereview.chromium.org/2046493007
Cr-Commit-Position: refs/heads/master@{#398730}
---
 sync/BUILD.gn                             |  1 -
 sync/internal_api/http_bridge.cc          | 15 ---------------
 sync/internal_api/http_bridge_unittest.cc | 10 ----------
 3 files changed, 26 deletions(-)

diff --git a/sync/BUILD.gn b/sync/BUILD.gn
index 9a9a98c0e18841..a406b37429829a 100644
--- a/sync/BUILD.gn
+++ b/sync/BUILD.gn
@@ -725,7 +725,6 @@ test("sync_unit_tests") {
     "//testing/gtest",
     "//third_party/leveldatabase",
     "//third_party/protobuf:protobuf_lite",
-    "//third_party/zlib",
   ]
 
   if (is_chromeos) {
diff --git a/sync/internal_api/http_bridge.cc b/sync/internal_api/http_bridge.cc
index 4675e2e1047acf..24e8413fedfa42 100644
--- a/sync/internal_api/http_bridge.cc
+++ b/sync/internal_api/http_bridge.cc
@@ -12,12 +12,10 @@
 #include "base/bit_cast.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop.h"
-#include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
-#include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "net/base/load_flags.h"
@@ -47,12 +45,6 @@ void LogTimeout(bool timed_out) {
   UMA_HISTOGRAM_BOOLEAN("Sync.URLFetchTimedOut", timed_out);
 }
 
-bool IsSyncHttpContentCompressionEnabled() {
-  const std::string group_name =
-      base::FieldTrialList::FindFullName("SyncHttpContentCompression");
-  return StartsWith(group_name, "Enabled", base::CompareCase::SENSITIVE);
-}
-
 void RecordSyncRequestContentLengthHistograms(int64_t compressed_content_length,
                                               int64_t original_content_length) {
   UMA_HISTOGRAM_COUNTS("Sync.RequestContentLength.Compressed",
@@ -253,13 +245,6 @@ void HttpBridge::MakeAsynchronousPost() {
   fetch_state_.url_poster->SetRequestContext(request_context_getter_.get());
   fetch_state_.url_poster->SetExtraRequestHeaders(extra_headers_);
 
-  if (!IsSyncHttpContentCompressionEnabled()) {
-    // We set "accept-encoding" here to avoid URLRequestHttpJob adding "gzip"
-    // into "accept-encoding" later.
-    fetch_state_.url_poster->AddExtraRequestHeader(base::StringPrintf(
-        "%s: %s", net::HttpRequestHeaders::kAcceptEncoding, "deflate"));
-  }
-
   fetch_state_.url_poster->SetUploadData(content_type_, request_content_);
   RecordSyncRequestContentLengthHistograms(request_content_.size(),
                                            request_content_.size());
diff --git a/sync/internal_api/http_bridge_unittest.cc b/sync/internal_api/http_bridge_unittest.cc
index 55dfd1954accad..3f4d9a949c948a 100644
--- a/sync/internal_api/http_bridge_unittest.cc
+++ b/sync/internal_api/http_bridge_unittest.cc
@@ -6,10 +6,8 @@
 #include <stdint.h>
 
 #include "base/bit_cast.h"
-#include "base/metrics/field_trial.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
-#include "base/test/mock_entropy_provider.h"
 #include "base/threading/thread.h"
 #include "build/build_config.h"
 #include "net/http/http_response_headers.h"
@@ -21,7 +19,6 @@
 #include "sync/internal_api/public/http_bridge.h"
 #include "sync/internal_api/public/http_post_provider_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/zlib/zlib.h"
 
 namespace syncer {
 
@@ -270,9 +267,6 @@ TEST_F(MAYBE_SyncHttpBridgeTest, CompressedRequestHeaderCheck) {
 
   int os_error = 0;
   int response_code = 0;
-  base::FieldTrialList field_trial_list(new base::MockEntropyProvider());
-  base::FieldTrialList::CreateFieldTrial("SyncHttpContentCompression",
-                                         "Enabled");
   bool success = http_bridge->MakeSynchronousPost(&os_error, &response_code);
   EXPECT_TRUE(success);
   EXPECT_EQ(200, response_code);
@@ -312,10 +306,6 @@ TEST_F(MAYBE_SyncHttpBridgeTest, TestMakeSynchronousPostLiveComprehensive) {
   std::string response(http_bridge->GetResponseContent(),
                        http_bridge->GetResponseContentLength());
   EXPECT_EQ(std::string::npos, response.find("Cookie:"));
-  EXPECT_NE(std::string::npos,
-            response.find(base::StringPrintf(
-                "%s: %s", net::HttpRequestHeaders::kAcceptEncoding,
-                "deflate")));
   EXPECT_NE(std::string::npos,
             response.find(base::StringPrintf("%s: %s",
                           net::HttpRequestHeaders::kUserAgent, kUserAgent)));