| Index: sync/internal_api/http_bridge_unittest.cc
|
| diff --git a/sync/internal_api/http_bridge_unittest.cc b/sync/internal_api/http_bridge_unittest.cc
|
| index 55dfd1954accad02125a94895bac62dd0073ecc7..3f4d9a949c948a58ced2ece4ac774e2331e1fd57 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);
|
| @@ -313,10 +307,6 @@ TEST_F(MAYBE_SyncHttpBridgeTest, TestMakeSynchronousPostLiveComprehensive) {
|
| 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)));
|
| EXPECT_NE(std::string::npos, response.find(test_payload.c_str()));
|
|
|