Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(207)

Unified Diff: chrome/browser/sync/test/integration/sync_test.cc

Issue 1701063002: CookieStore: Remove reference counting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@threadsafe
Patch Set: merge Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/test/integration/sync_test.h ('k') | chrome/test/base/testing_profile.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 b36cefb10dca6bb9119920b9976a5b4d0eba9e5b..2aaedadf624414dfb66272ce30c9c1aae550560e 100644
--- a/chrome/browser/sync/test/integration/sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -81,12 +81,9 @@
#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"
-#include "net/url_request/url_request_context.h"
-#include "net/url_request/url_request_context_getter.h"
#include "sync/engine/sync_scheduler_impl.h"
#include "sync/protocol/sync.pb.h"
#include "sync/test/fake_server/fake_server.h"
@@ -176,14 +173,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(
@@ -535,8 +524,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(
@@ -1118,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();
}
« no previous file with comments | « chrome/browser/sync/test/integration/sync_test.h ('k') | chrome/test/base/testing_profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698