chrome/browser/sync/test_profile_sync_service.cc - Issue 367153005: Sync: Refactoring of DEVICE_INFO syncable type - Part 1

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/test_profile_sync_service.cc

Issue 367153005: Sync: Refactoring of DEVICE_INFO syncable type - Part 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed scoped_ptr issue in ProfileSyncService constructor Created 6 years, 5 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_profile_sync_service.h ('k') | chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/test_profile_sync_service.cc

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

index 3af8872efd2cd7db16582d233c88d800155045bf..81a9220a65ef9a2fd03c8b9da921070c868a9174 100644

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

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

@@ -103,13 +103,13 @@ TestProfileSyncService::GetJsEventHandler() {

}

TestProfileSyncService::TestProfileSyncService(

- ProfileSyncComponentsFactory* factory,

+ scoped_ptr<ProfileSyncComponentsFactory> factory,

Profile* profile,

SigninManagerBase* signin,

ProfileOAuth2TokenService* oauth2_token_service,

browser_sync::ProfileSyncServiceStartBehavior behavior)

: ProfileSyncService(

- factory,

+ factory.Pass(),

profile,

make_scoped_ptr(new SupervisedUserSigninManagerWrapper(profile,

signin)),

@@ -129,13 +129,13 @@ KeyedService* TestProfileSyncService::TestFactoryFunction(

SigninManagerFactory::GetForProfile(profile);

ProfileOAuth2TokenService* oauth2_token_service =

ProfileOAuth2TokenServiceFactory::GetForProfile(profile);

- ProfileSyncComponentsFactoryMock* factory =

- new ProfileSyncComponentsFactoryMock();

- return new TestProfileSyncService(factory,

- profile,

- signin,

- oauth2_token_service,

- browser_sync::AUTO_START);

+ return new TestProfileSyncService(

+ scoped_ptr<ProfileSyncComponentsFactory>(

+ new ProfileSyncComponentsFactoryMock()),

+ profile,

+ signin,

+ oauth2_token_service,

+ browser_sync::AUTO_START);

}

// static