chrome/browser/sync/profile_sync_service_factory.cc - Issue 1310553005: [Sync] Replace ProfileSyncComponentsFactory with SyncClient

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Self review 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

« chrome/browser/sync/profile_sync_service.h ('K') | « chrome/browser/sync/profile_sync_service_autofill_unittest.cc ('k') | chrome/browser/sync/profile_sync_service_mock.h » ('j') | components/sync_driver/non_ui_data_type_controller.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..47c8a01f9ad7eb4a45b650e294eac65ac913b3d4 100644

--- a/chrome/browser/sync/profile_sync_service_factory.cc

+++ b/chrome/browser/sync/profile_sync_service_factory.cc

@@ -148,12 +148,12 @@ 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()->Initialize(pss);

pss->factory()->RegisterDataTypes(pss);

pss->Initialize();

return pss;