chrome/browser/sync/glue/bridged_sync_notifier_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: chrome/browser/sync/glue/bridged_sync_notifier_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

« no previous file with comments | « chrome/browser/sync/glue/bridged_sync_notifier.cc ('k') | chrome/browser/sync/glue/chrome_sync_notification_bridge_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/glue/bridged_sync_notifier_unittest.cc

diff --git a/chrome/browser/sync/glue/bridged_sync_notifier_unittest.cc b/chrome/browser/sync/glue/bridged_sync_notifier_unittest.cc

index 7adebc12a67e745a8523a3631c7c54c9e3c4b821..80a4a74527d290b60a0f24045609ce8153357d4a 100644

--- a/chrome/browser/sync/glue/bridged_sync_notifier_unittest.cc

+++ b/chrome/browser/sync/glue/bridged_sync_notifier_unittest.cc

@@ -47,7 +47,7 @@ class MockSyncNotifier : 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, void(syncable::ModelTypeSet));

MOCK_METHOD1(SendNotification, void(syncable::ModelTypeSet));

@@ -92,10 +92,10 @@ TEST_F(BridgedSyncNotifierTest, SetUniqueId) {

bridged_notifier_.SetUniqueId(unique_id);

}

-TEST_F(BridgedSyncNotifierTest, SetState) {

+TEST_F(BridgedSyncNotifierTest, SetStateDeprecated) {

std::string state = "state";

- EXPECT_CALL(*mock_delegate_, SetState(state));

- bridged_notifier_.SetState(state);

+ EXPECT_CALL(*mock_delegate_, SetStateDeprecated(state));

+ bridged_notifier_.SetStateDeprecated(state);

}

TEST_F(BridgedSyncNotifierTest, UpdateCredentials) {