sync: Remove the remaining conflict sets 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 25 matching lines @@
   status.set_invalid_store(false);
   EXPECT_TRUE(status.TestAndClearIsDirty());
 
   status.increment_num_successful_commits();
   EXPECT_TRUE(status.TestAndClearIsDirty());
   status.increment_num_successful_commits();
   EXPECT_TRUE(status.TestAndClearIsDirty());
 
   {
     ScopedModelSafeGroupRestriction r(&status, GROUP_UI);
-    status.mutable_conflict_progress()->AddConflictingItemById(syncable::Id());
+    status.mutable_conflict_progress()->
+        AddSimpleConflictingItemById(syncable::Id());
   }
   EXPECT_TRUE(status.TestAndClearIsDirty());
 
   std::vector<int64> v;
   v.push_back(1);
   status.set_unsynced_handles(v);
   EXPECT_TRUE(status.TestAndClearIsDirty());
   std::vector<int64> v2;
   v2.push_back(1);
   status.set_unsynced_handles(v2);
@@ skipping 54 matching lines @@
 }
 
 TEST_F(StatusControllerTest, HasConflictingUpdates) {
   StatusController status(routes_);
   EXPECT_FALSE(status.HasConflictingUpdates());
   {
     ScopedModelSafeGroupRestriction r(&status, GROUP_UI);
     EXPECT_FALSE(status.update_progress());
     status.mutable_update_progress()->AddAppliedUpdate(SUCCESS,
         syncable::Id());
-    status.mutable_update_progress()->AddAppliedUpdate(CONFLICT,
+    status.mutable_update_progress()->AddAppliedUpdate(CONFLICT_SIMPLE,
         syncable::Id());
     EXPECT_TRUE(status.update_progress()->HasConflictingUpdates());
   }
 
   EXPECT_TRUE(status.HasConflictingUpdates());
 
   {
     ScopedModelSafeGroupRestriction r(&status, GROUP_PASSIVE);
     EXPECT_FALSE(status.update_progress());
   }
 }
 
+TEST_F(StatusControllerTest, HasConflictingUpdates_NonBlockingUpdates) {
+  StatusController status(routes_);
+  EXPECT_FALSE(status.HasConflictingUpdates());
+  {
+    ScopedModelSafeGroupRestriction r(&status, GROUP_UI);
+    EXPECT_FALSE(status.update_progress());
+    status.mutable_update_progress()->AddAppliedUpdate(SUCCESS,
+        syncable::Id());
+    status.mutable_update_progress()->AddAppliedUpdate(CONFLICT_HIERARCHY,
+        syncable::Id());
+    EXPECT_TRUE(status.update_progress()->HasConflictingUpdates());
+  }
+
+  EXPECT_TRUE(status.HasConflictingUpdates());
+}
+
 TEST_F(StatusControllerTest, CountUpdates) {
   StatusController status(routes_);
   EXPECT_EQ(0, status.CountUpdates());
   ClientToServerResponse* response(status.mutable_updates_response());
   sync_pb::SyncEntity* entity1 = response->mutable_get_updates()->add_entries();
   sync_pb::SyncEntity* entity2 = response->mutable_get_updates()->add_entries();
   ASSERT_TRUE(entity1 != NULL && entity2 != NULL);
   EXPECT_EQ(2, status.CountUpdates());
 }
 
 // Test TotalNumConflictingItems
 TEST_F(StatusControllerTest, TotalNumConflictingItems) {
   StatusController status(routes_);
   TestIdFactory f;
   {
     ScopedModelSafeGroupRestriction r(&status, GROUP_UI);
     EXPECT_FALSE(status.conflict_progress());
-    status.mutable_conflict_progress()->AddConflictingItemById(f.NewLocalId());
-    status.mutable_conflict_progress()->AddConflictingItemById(f.NewLocalId());
-    EXPECT_EQ(2, status.conflict_progress()->ConflictingItemsSize());
+    status.mutable_conflict_progress()->
+        AddSimpleConflictingItemById(f.NewLocalId());
+    status.mutable_conflict_progress()->
+        AddSimpleConflictingItemById(f.NewLocalId());
+    EXPECT_EQ(2, status.conflict_progress()->SimpleConflictingItemsSize());
   }
   EXPECT_EQ(2, status.TotalNumConflictingItems());
   {
     ScopedModelSafeGroupRestriction r(&status, GROUP_DB);
     EXPECT_FALSE(status.conflict_progress());
-    status.mutable_conflict_progress()->AddConflictingItemById(f.NewLocalId());
-    status.mutable_conflict_progress()->AddConflictingItemById(f.NewLocalId());
-    EXPECT_EQ(2, status.conflict_progress()->ConflictingItemsSize());
+    status.mutable_conflict_progress()->
+        AddSimpleConflictingItemById(f.NewLocalId());
+    status.mutable_conflict_progress()->
+        AddSimpleConflictingItemById(f.NewLocalId());
+    EXPECT_EQ(2, status.conflict_progress()->SimpleConflictingItemsSize());
   }
   EXPECT_EQ(4, status.TotalNumConflictingItems());
 }
 
 // Basic test that non group-restricted state accessors don't cause violations.
 TEST_F(StatusControllerTest, Unrestricted) {
   StatusController status(routes_);
   const UpdateProgress* progress =
       status.GetUnrestrictedUpdateProgress(GROUP_UI);
   EXPECT_FALSE(progress);
   status.mutable_commit_message();
   status.commit_response();
   status.mutable_commit_response();
   status.updates_response();
   status.mutable_updates_response();
   status.error();
   status.syncer_status();
   status.num_server_changes_remaining();
   status.commit_ids();
   status.HasBookmarkCommitActivity();
   status.download_updates_succeeded();
   status.ServerSaysNothingMoreToDownload();
   status.group_restriction();
 }
 
 }  // namespace sessions
 }  // namespace browser_sync