sync/internal_api/syncapi_unittest.cc - Issue 10451060: sync: migrate invalidation state from syncable::Directory to InvalidationStorage

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: sync/internal_api/syncapi_unittest.cc

Issue 10451060: sync: migrate invalidation state from syncable::Directory to InvalidationStorage (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: include order Created 8 years, 7 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

Index: sync/internal_api/syncapi_unittest.cc

diff --git a/sync/internal_api/syncapi_unittest.cc b/sync/internal_api/syncapi_unittest.cc

index 04705c691055b481c20d28b9b2a936d3237967f6..b1e88fec51097a99c06e958445fd9dc55325e93c 100644

--- a/sync/internal_api/syncapi_unittest.cc

+++ b/sync/internal_api/syncapi_unittest.cc

@@ -713,7 +713,7 @@ class SyncNotifierMock : public sync_notifier::SyncNotifier {

MOCK_METHOD1(AddObserver, void(sync_notifier::SyncNotifierObserver*));

MOCK_METHOD1(RemoveObserver, void(sync_notifier::SyncNotifierObserver*));

MOCK_METHOD1(SetUniqueId, void(const std::string&));

- MOCK_METHOD1(SetState, void(const std::string&));

+ MOCK_METHOD1(SetStateDeprecated, void(const std::string&));

MOCK_METHOD2(UpdateCredentials,

void(const std::string&, const std::string&));

MOCK_METHOD1(UpdateEnabledTypes,

@@ -760,7 +760,7 @@ class SyncManagerTest : public testing::Test,

EXPECT_CALL(*sync_notifier_mock_, AddObserver(_)).

WillOnce(Invoke(this, &SyncManagerTest::SyncNotifierAddObserver));

EXPECT_CALL(*sync_notifier_mock_, SetUniqueId(_));

- EXPECT_CALL(*sync_notifier_mock_, SetState(""));

+ EXPECT_CALL(*sync_notifier_mock_, SetStateDeprecated(""));

EXPECT_CALL(*sync_notifier_mock_,

UpdateCredentials(credentials.email, credentials.sync_token));

EXPECT_CALL(*sync_notifier_mock_, UpdateEnabledTypes(_)).

« no previous file with comments | « sync/internal_api/sync_manager.cc ('k') | sync/notifier/chrome_invalidation_client.h » ('j') | no next file with comments »