chrome/browser/sync/engine/syncapi_unittest.cc - Issue 6902101: Refactor sync passphrase setup flow and fix passphrase tests

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/engine/syncapi_unittest.cc

Issue 6902101: Refactor sync passphrase setup flow and fix passphrase tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase. Created 9 years, 8 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: chrome/browser/sync/engine/syncapi_unittest.cc

diff --git a/chrome/browser/sync/engine/syncapi_unittest.cc b/chrome/browser/sync/engine/syncapi_unittest.cc

index 15d509f8c8c68bd6834a4158fff7798e15418114..465a64228e65b47fcfc0cbe49934a8080bd6eb8e 100644

--- a/chrome/browser/sync/engine/syncapi_unittest.cc

+++ b/chrome/browser/sync/engine/syncapi_unittest.cc

@@ -600,8 +600,8 @@ class SyncManagerObserverMock : public SyncManager::Observer {

void(const SyncSessionSnapshot*)); // NOLINT

MOCK_METHOD0(OnInitializationComplete, void()); // NOLINT

MOCK_METHOD1(OnAuthError, void(const GoogleServiceAuthError&)); // NOLINT

- MOCK_METHOD1(OnPassphraseRequired, void(bool)); // NOLINT

- MOCK_METHOD0(OnPassphraseFailed, void()); // NOLINT

+ MOCK_METHOD1(OnPassphraseRequired,

+ void(sync_api::PassphraseRequiredReason)); // NOLINT

MOCK_METHOD1(OnPassphraseAccepted, void(const std::string&)); // NOLINT

MOCK_METHOD0(OnStopSyncingPermanently, void()); // NOLINT

MOCK_METHOD1(OnUpdatedToken, void(const std::string&)); // NOLINT