chrome/browser/sync/profile_sync_components_factory_mock.h - Issue 597423002: Device info datatype should be moved to components/sync_driver.

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_components_factory_mock.h

Issue 597423002: Device info datatype should be moved to components/sync_driver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Minor CR feedback addressed. Created 6 years, 3 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/profile_sync_components_factory_impl.cc ('k') | chrome/browser/sync/profile_sync_components_factory_mock.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/profile_sync_components_factory_mock.h

diff --git a/chrome/browser/sync/profile_sync_components_factory_mock.h b/chrome/browser/sync/profile_sync_components_factory_mock.h

index 978f0505839d7b684b138d03953fb15acbe399b3..224ea9c499bfb4032ebda73553a80e111cd145ae 100644

--- a/chrome/browser/sync/profile_sync_components_factory_mock.h

+++ b/chrome/browser/sync/profile_sync_components_factory_mock.h

@@ -43,10 +43,10 @@ class ProfileSyncComponentsFactoryMock : public ProfileSyncComponentsFactory {

const base::WeakPtr<sync_driver::SyncPrefs>& sync_prefs,

const base::FilePath& sync_folder));

- virtual scoped_ptr<browser_sync::LocalDeviceInfoProvider>

+ virtual scoped_ptr<sync_driver::LocalDeviceInfoProvider>

CreateLocalDeviceInfoProvider() OVERRIDE;

void SetLocalDeviceInfoProvider(

- scoped_ptr<browser_sync::LocalDeviceInfoProvider> local_device);

+ scoped_ptr<sync_driver::LocalDeviceInfoProvider> local_device);

MOCK_METHOD1(GetSyncableServiceForType,

base::WeakPtr<syncer::SyncableService>(syncer::ModelType));

@@ -75,7 +75,7 @@ class ProfileSyncComponentsFactoryMock : public ProfileSyncComponentsFactory {

scoped_ptr<sync_driver::ChangeProcessor> change_processor_;

// LocalDeviceInfoProvider is initially owned by this class,

// transferred to caller when CreateLocalDeviceInfoProvider is called.

- scoped_ptr<browser_sync::LocalDeviceInfoProvider> local_device_;

+ scoped_ptr<sync_driver::LocalDeviceInfoProvider> local_device_;

};

#endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_COMPONENTS_FACTORY_MOCK_H__