chrome/browser/sync/profile_sync_service_mock.h - 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/profile_sync_service_mock.h

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

Patch Set: Addressed build issues in browser_tests 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

« chrome/browser/sync/glue/local_device_info_provider_mock.h ('K') | « chrome/browser/sync/profile_sync_service.cc ('k') | chrome/browser/sync/profile_sync_service_mock.cc » ('j') | chrome/browser/sync/sessions/sessions_sync_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/profile_sync_service_mock.h

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

index 6f451dab27fa7f4b68f2e55dccadec7be1ba043d..970e88346ff3d366edf73c5d993e347c3731eb06 100644

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

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

@@ -37,9 +37,10 @@ class ProfileSyncServiceMock : public ProfileSyncService {

content::BrowserContext* profile);

MOCK_METHOD0(DisableForUser, void());

- MOCK_METHOD3(OnBackendInitialized,

+ MOCK_METHOD4(OnBackendInitialized,

void(const syncer::WeakHandle<syncer::JsBackend>&,

const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>&,

+ const std::string&,

bool));

MOCK_METHOD0(OnSyncCycleCompleted, void());

MOCK_METHOD0(OnAuthError, void());

@@ -100,12 +101,6 @@ class ProfileSyncServiceMock : public ProfileSyncService {

virtual ScopedVector<browser_sync::DeviceInfo>

GetAllSignedInDevices() const OVERRIDE;

- virtual scoped_ptr<browser_sync::DeviceInfo> GetLocalDeviceInfo()

- const OVERRIDE;

- MOCK_CONST_METHOD0(GetLocalDeviceInfoMock,

- browser_sync::DeviceInfo*());

- MOCK_CONST_METHOD0(GetLocalSyncCacheGUID, std::string());

// DataTypeManagerObserver mocks.

MOCK_METHOD0(OnConfigureBlocked, void());

MOCK_METHOD1(OnConfigureDone,