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

Unified Diff: sync/sessions/status_controller_unittest.cc

Issue 11314008: sync: Follow-up to conflict resolution refactor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tests Created 8 years, 2 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 | « sync/sessions/status_controller.cc ('k') | sync/sessions/sync_session.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/sessions/status_controller_unittest.cc
diff --git a/sync/sessions/status_controller_unittest.cc b/sync/sessions/status_controller_unittest.cc
index 95362e5b0104009e49fa4857b9d36cd7dd77b987..d361a6e295bb09c3b2481e82a9339aa21dd8e0ad 100644
--- a/sync/sessions/status_controller_unittest.cc
+++ b/sync/sessions/status_controller_unittest.cc
@@ -26,10 +26,6 @@ TEST_F(StatusControllerTest, ReadYourWrites) {
status.set_num_server_changes_remaining(13);
EXPECT_EQ(13, status.num_server_changes_remaining());
- EXPECT_FALSE(status.conflicts_resolved());
- status.update_conflicts_resolved(true);
- EXPECT_TRUE(status.conflicts_resolved());
-
status.set_last_download_updates_result(SYNCER_OK);
EXPECT_EQ(SYNCER_OK,
status.model_neutral_state().last_download_updates_result);
« no previous file with comments | « sync/sessions/status_controller.cc ('k') | sync/sessions/sync_session.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698