Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2843)

Unified Diff: chrome/browser/sync/sessions/status_controller_unittest.cc

Issue 1161006: Make it clear what last_sync_timestamp actually tracks. Update (Closed)
Patch Set: Undo accidental patch-juggling mistake. Created 10 years, 9 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/sessions/status_controller.cc ('k') | chrome/browser/sync/sessions/sync_session.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/sessions/status_controller_unittest.cc
diff --git a/chrome/browser/sync/sessions/status_controller_unittest.cc b/chrome/browser/sync/sessions/status_controller_unittest.cc
index 24c4025da1927901caf5e57a5b629adf2e3f2c09..d1ee710a1e0a011506525aec495e00c0c0134f97 100644
--- a/chrome/browser/sync/sessions/status_controller_unittest.cc
+++ b/chrome/browser/sync/sessions/status_controller_unittest.cc
@@ -103,8 +103,6 @@ TEST_F(StatusControllerTest, StaysClean) {
EXPECT_FALSE(status.TestAndClearIsDirty());
status.update_conflicts_resolved(true);
EXPECT_FALSE(status.TestAndClearIsDirty());
- status.set_got_new_timestamp();
- EXPECT_FALSE(status.TestAndClearIsDirty());
status.set_items_committed();
EXPECT_FALSE(status.TestAndClearIsDirty());
@@ -196,13 +194,11 @@ TEST_F(StatusControllerTest, HasConflictingUpdates) {
TEST_F(StatusControllerTest, CountUpdates) {
StatusController status(routes_);
EXPECT_EQ(0, status.CountUpdates());
- EXPECT_TRUE(status.got_zero_updates());
ClientToServerResponse* response(status.mutable_updates_response());
sync_pb::SyncEntity* entity1 = response->mutable_get_updates()->add_entries();
sync_pb::SyncEntity* entity2 = response->mutable_get_updates()->add_entries();
ASSERT_TRUE(entity1 != NULL && entity2 != NULL);
EXPECT_EQ(2, status.CountUpdates());
- EXPECT_FALSE(status.got_zero_updates());
}
// Test TotalNumConflictingItems
@@ -242,7 +238,8 @@ TEST_F(StatusControllerTest, Unrestricted) {
status.ComputeMaxLocalTimestamp();
status.commit_ids();
status.HasBookmarkCommitActivity();
- status.got_zero_updates();
+ status.download_updates_succeeded();
+ status.server_says_nothing_more_to_download();
status.group_restriction();
}
« no previous file with comments | « chrome/browser/sync/sessions/status_controller.cc ('k') | chrome/browser/sync/sessions/sync_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698