components/browser_sync/browser/profile_sync_service_mock.h - Issue 2064183002: Reland: "Sync: Support multiple setup UIs."

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: components/browser_sync/browser/profile_sync_service_mock.h

Issue 2064183002: Reland: "Sync: Support multiple setup UIs." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Merge branch 'master' of https://chromium.googlesource.com/chromium/src into 0183-settings-sync-rel… Created 4 years, 6 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:

Index: components/browser_sync/browser/profile_sync_service_mock.h

diff --git a/components/browser_sync/browser/profile_sync_service_mock.h b/components/browser_sync/browser/profile_sync_service_mock.h

index 255aa2fba9bfd5f7006a54f0cb69d04abc4f134b..5985c7e5c41ca33e4546014c530e38be31d8302d 100644

--- a/components/browser_sync/browser/profile_sync_service_mock.h

+++ b/components/browser_sync/browser/profile_sync_service_mock.h

@@ -76,7 +76,6 @@ class ProfileSyncServiceMock : public ProfileSyncService {

MOCK_CONST_METHOD0(IsSyncRequested, bool());

MOCK_CONST_METHOD0(waiting_for_auth, bool());

MOCK_METHOD1(OnActionableError, void(const syncer::SyncProtocolError&));

- MOCK_METHOD1(SetSetupInProgress, void(bool));

MOCK_CONST_METHOD1(IsDataTypeControllerRunning, bool(syncer::ModelType));

// DataTypeManagerObserver mocks.

@@ -96,6 +95,8 @@ class ProfileSyncServiceMock : public ProfileSyncService {

MOCK_METHOD1(SetDecryptionPassphrase, bool(const std::string& passphrase));

MOCK_METHOD2(SetEncryptionPassphrase, void(const std::string& passphrase,

PassphraseType type));

+ MOCK_METHOD0(OnSetupInProgressHandleDestroyed, void());

};

#endif // COMPONENTS_BROWSER_SYNC_BROWSER_PROFILE_SYNC_SERVICE_MOCK_H_