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

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

Issue 9107055: Remove single direction conflict set code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Pre-emptive rebase Created 8 years, 11 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 2c7b692600fcbc0fe3fe9461bb523cea4e83e16b..1b3c17f10eb25a8b4aace85f92ad2727c30b28ed 100644
--- a/chrome/browser/sync/sessions/status_controller_unittest.cc
+++ b/chrome/browser/sync/sessions/status_controller_unittest.cc
@@ -78,8 +78,6 @@ TEST_F(StatusControllerTest, GetsDirty) {
TEST_F(StatusControllerTest, StaysClean) {
StatusController status(routes_);
- status.update_conflict_sets_built(true);
- EXPECT_FALSE(status.TestAndClearIsDirty());
status.update_conflicts_resolved(true);
EXPECT_FALSE(status.TestAndClearIsDirty());
@@ -125,10 +123,6 @@ TEST_F(StatusControllerTest, ReadYourWrites) {
status.update_conflicts_resolved(true);
EXPECT_TRUE(status.conflicts_resolved());
- EXPECT_FALSE(status.conflict_sets_built());
- status.update_conflict_sets_built(true);
- EXPECT_TRUE(status.conflict_sets_built());
-
status.set_last_download_updates_result(SYNCER_OK);
EXPECT_EQ(SYNCER_OK, status.error().last_download_updates_result);
« 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