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

Unified Diff: chrome/browser/sync/profile_sync_service_factory.cc

Issue 1310553005: [Sync] Replace ProfileSyncComponentsFactory with SyncClient (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Really fix GN Created 5 years, 4 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
Index: chrome/browser/sync/profile_sync_service_factory.cc
diff --git a/chrome/browser/sync/profile_sync_service_factory.cc b/chrome/browser/sync/profile_sync_service_factory.cc
index 0c19634bcf3143c1a301c95f5413b2b65fe426f3..11ff0848ea2ba8460fe1f116e5fe9e2f180b79c9 100644
--- a/chrome/browser/sync/profile_sync_service_factory.cc
+++ b/chrome/browser/sync/profile_sync_service_factory.cc
@@ -148,13 +148,13 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceInstanceFor(
browser_defaults::kSyncAutoStarts ? browser_sync::AUTO_START
: browser_sync::MANUAL_START;
ProfileSyncService* pss = new ProfileSyncService(
- scoped_ptr<ProfileSyncComponentsFactory>(
+ scoped_ptr<sync_driver::SyncApiComponentFactory>(
new ProfileSyncComponentsFactoryImpl(
profile, base::CommandLine::ForCurrentProcess(), sync_service_url,
token_service, url_request_context_getter)),
profile, signin_wrapper.Pass(), token_service, behavior);
-
- pss->factory()->RegisterDataTypes(pss);
+ pss->factory()->Initialize(pss);
+ pss->factory()->RegisterDataTypes();
pss->Initialize();
return pss;
}
« no previous file with comments | « chrome/browser/sync/profile_sync_service_autofill_unittest.cc ('k') | chrome/browser/sync/profile_sync_service_mock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698