| Index: chrome/browser/sync/test/integration/sync_test.cc
|
| diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
|
| index 3722d61a106315a23891f87a9a91e50a3512abed..64ac02fa6889086e1cb0ab9475c3a6fe83acb181 100644
|
| --- a/chrome/browser/sync/test/integration/sync_test.cc
|
| +++ b/chrome/browser/sync/test/integration/sync_test.cc
|
| @@ -81,7 +81,6 @@
|
| #include "net/base/load_flags.h"
|
| #include "net/base/network_change_notifier.h"
|
| #include "net/base/port_util.h"
|
| -#include "net/cookies/cookie_monster.h"
|
| #include "net/url_request/test_url_fetcher_factory.h"
|
| #include "net/url_request/url_fetcher.h"
|
| #include "net/url_request/url_fetcher_delegate.h"
|
| @@ -176,14 +175,6 @@ class EncryptionChecker : public SingleClientStatusChangeChecker {
|
| std::string GetDebugMessage() const override { return "Encryption"; }
|
| };
|
|
|
| -void SetupNetworkCallback(
|
| - base::WaitableEvent* done,
|
| - net::URLRequestContextGetter* url_request_context_getter) {
|
| - url_request_context_getter->GetURLRequestContext()->
|
| - set_cookie_store(new net::CookieMonster(NULL, NULL));
|
| - done->Signal();
|
| -}
|
| -
|
| scoped_ptr<KeyedService> BuildFakeServerProfileInvalidationProvider(
|
| content::BrowserContext* context) {
|
| return make_scoped_ptr(new invalidation::ProfileInvalidationProvider(
|
| @@ -527,8 +518,6 @@ void SyncTest::InitializeProfile(int index, Profile* profile) {
|
| ProfileSyncService* profile_sync_service =
|
| ProfileSyncServiceFactory::GetForProfile(GetProfile(index));
|
|
|
| - SetupNetwork(GetProfile(index)->GetRequestContext());
|
| -
|
| if (server_type_ == IN_PROCESS_FAKE_SERVER) {
|
| // TODO(pvalenzuela): Run the fake server via EmbeddedTestServer.
|
| profile_sync_service->OverrideNetworkResourcesForTest(
|
| @@ -1116,15 +1105,6 @@ void SyncTest::TriggerCreateSyncedBookmarks() {
|
| GetTitle()));
|
| }
|
|
|
| -void SyncTest::SetupNetwork(net::URLRequestContextGetter* context_getter) {
|
| - base::WaitableEvent done(false, false);
|
| - BrowserThread::PostTask(
|
| - BrowserThread::IO, FROM_HERE,
|
| - base::Bind(&SetupNetworkCallback, &done,
|
| - make_scoped_refptr(context_getter)));
|
| - done.Wait();
|
| -}
|
| -
|
| fake_server::FakeServer* SyncTest::GetFakeServer() const {
|
| return fake_server_.get();
|
| }
|
|
|