Remove single direction conflict set code

chrome/browser/sync/sessions/sync_session_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/sessions/sync_session.h"
 
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
@@ skipping 199 matching lines @@
 
   std::vector<int64> unsynced_handles;
   unsynced_handles.push_back(1);
   unsynced_handles.push_back(2);
   status()->set_unsynced_handles(unsynced_handles);
   EXPECT_FALSE(session_->HasMoreToSync());
   status()->increment_num_successful_commits();
   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());
 
   // When DownloadUpdatesCommand fails, these should be false.
   EXPECT_FALSE(status()->ServerSaysNothingMoreToDownload());
   EXPECT_FALSE(status()->download_updates_succeeded());
 
   // Download updates has its own loop in the syncer; it shouldn't factor
   // into HasMoreToSync.
   EXPECT_FALSE(session_->HasMoreToSync());
@@ skipping 354 matching lines @@
   EXPECT_EQ(empty_payload, original[syncable::BOOKMARKS]);
   EXPECT_EQ(payload1, original[syncable::PASSWORDS]);
   EXPECT_EQ(payload1, original[syncable::AUTOFILL]);
   EXPECT_EQ(payload2, original[syncable::SESSIONS]);
   EXPECT_EQ(payload3, original[syncable::THEMES]);
 }
 
 }  // namespace
 }  // namespace sessions
 }  // namespace browser_sync