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()); |