Remove single direction conflict set code

chrome/browser/sync/sessions/status_controller_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/sync/test/engine/test_id_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace browser_sync {
 namespace sessions {
@@ skipping 60 matching lines @@
   status.set_unsynced_handles(v);
   EXPECT_TRUE(status.TestAndClearIsDirty());
   std::vector<int64> v2;
   v2.push_back(1);
   status.set_unsynced_handles(v2);
   EXPECT_FALSE(status.TestAndClearIsDirty());  // Test for deep comparison.
 }
 
 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());
 
   status.set_items_committed();
   EXPECT_FALSE(status.TestAndClearIsDirty());
 
   OrderedCommitSet commits(routes_);
   commits.AddCommitItem(0, syncable::Id(), syncable::BOOKMARKS);
   status.set_commit_set(commits);
   EXPECT_FALSE(status.TestAndClearIsDirty());
@@ skipping 25 matching lines @@
   EXPECT_EQ(13, status.num_server_changes_remaining());
 
   EXPECT_FALSE(status.syncer_status().invalid_store);
   status.set_invalid_store(true);
   EXPECT_TRUE(status.syncer_status().invalid_store);
 
   EXPECT_FALSE(status.conflicts_resolved());
   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);
 
   status.set_last_post_commit_result(SYNC_AUTH_ERROR);
   EXPECT_EQ(SYNC_AUTH_ERROR, status.error().last_post_commit_result);
 
   status.set_last_process_commit_response_result(SYNC_SERVER_ERROR);
   EXPECT_EQ(SYNC_SERVER_ERROR,
             status.error().last_process_commit_response_result);
 
@@ skipping 76 matching lines @@
   status.num_server_changes_remaining();
   status.commit_ids();
   status.HasBookmarkCommitActivity();
   status.download_updates_succeeded();
   status.ServerSaysNothingMoreToDownload();
   status.group_restriction();
 }
 
 }  // namespace sessions
 }  // namespace browser_sync