chrome/browser/sync/profile_sync_service_mock.cc - Issue 1421003007: [Sync] Componentize ProfileSyncComponentsFactoryImpl

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_mock.cc

Issue 1421003007: [Sync] Componentize ProfileSyncComponentsFactoryImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix browser_tests Created 5 years, 1 month 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_factory.cc ('K') | « chrome/browser/sync/profile_sync_service_factory_unittest.cc ('k') | chrome/browser/sync/profile_sync_service_startup_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/profile_sync_service_mock.cc

diff --git a/chrome/browser/sync/profile_sync_service_mock.cc b/chrome/browser/sync/profile_sync_service_mock.cc

index 209187aefa81f0b2c49f3907ce4ec088680d9602..f9bea1f70f1dcd484fa915a2af909dd3138d8c48 100644

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

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

@@ -21,11 +21,7 @@

ProfileSyncServiceMock::ProfileSyncServiceMock(Profile* profile)

: ProfileSyncServiceMock(

- make_scoped_ptr(

- new browser_sync::ChromeSyncClient(

- profile,

- make_scoped_ptr(new SyncApiComponentFactoryMock())))

- .Pass(),

+ make_scoped_ptr(new browser_sync::ChromeSyncClient(profile)),

profile) {}

ProfileSyncServiceMock::ProfileSyncServiceMock(

@@ -64,6 +60,9 @@ TestingProfile* ProfileSyncServiceMock::MakeSignedInTestingProfile() {

// static

scoped_ptr<KeyedService> ProfileSyncServiceMock::BuildMockProfileSyncService(

content::BrowserContext* profile) {

- return make_scoped_ptr(

+ scoped_ptr<ProfileSyncServiceMock> sync_service(

new ProfileSyncServiceMock(static_cast<Profile*>(profile)));

+ sync_service->GetSyncClient()->Initialize(

+ make_scoped_ptr(new SyncApiComponentFactoryMock()), sync_service.get());

+ return sync_service.Pass();

}