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

Unified Diff: chrome/browser/sync/sessions/sync_session_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/sync_session.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/sessions/sync_session_unittest.cc
diff --git a/chrome/browser/sync/sessions/sync_session_unittest.cc b/chrome/browser/sync/sessions/sync_session_unittest.cc
index 660729afe1e2dcee6e8d50964b4548a7b4893f8f..de43b2d154a4e839f8f25022b59f92a22f260e98 100644
--- a/chrome/browser/sync/sessions/sync_session_unittest.cc
+++ b/chrome/browser/sync/sessions/sync_session_unittest.cc
@@ -217,13 +217,6 @@ TEST_F(SyncSessionTest, MoreToSyncIfUnsyncedGreaterThanCommitted) {
EXPECT_TRUE(session_->HasMoreToSync());
}
-TEST_F(SyncSessionTest, MoreToSyncIfConflictSetsBuilt) {
- // If we built conflict sets, then we need to loop back and try
- // to get updates & commit again.
- status()->update_conflict_sets_built(true);
- EXPECT_TRUE(session_->HasMoreToSync());
-}
-
TEST_F(SyncSessionTest, MoreToDownloadIfDownloadFailed) {
status()->set_updates_request_types(ParamsMeaningAllEnabledTypes());
« no previous file with comments | « chrome/browser/sync/sessions/sync_session.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698