sync: Remove the remaining conflict sets code

chrome/browser/sync/sessions/sync_session_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 "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
@@ skipping 140 matching lines @@
   session->mutable_status_controller()->
       GetUnrestrictedMutableConflictProgressForTest(GROUP_PASSIVE);
   EXPECT_TRUE(session->GetEnabledGroupsWithConflicts().empty());
 }
 
 TEST_F(SyncSessionTest, EnabledGroupsWithConflicts) {
   scoped_ptr<SyncSession> session(MakeSession());
   // Put GROUP_UI in conflict.
   session->mutable_status_controller()->
       GetUnrestrictedMutableConflictProgressForTest(GROUP_UI)->
-      AddConflictingItemById(syncable::Id());
+      AddSimpleConflictingItemById(syncable::Id());
   std::set<ModelSafeGroup> expected_enabled_groups_with_conflicts;
   expected_enabled_groups_with_conflicts.insert(GROUP_UI);
   EXPECT_EQ(expected_enabled_groups_with_conflicts,
             session->GetEnabledGroupsWithConflicts());
 }
 
 TEST_F(SyncSessionTest, ScopedContextHelpers) {
   ConflictResolver resolver;
   EXPECT_FALSE(context_->resolver());
   {
@@ skipping 412 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