sync: Remove the remaining conflict sets code

chrome/browser/sync/sessions/status_controller_unittest.cc

Index: chrome/browser/sync/sessions/status_controller_unittest.cc
diff --git a/chrome/browser/sync/sessions/status_controller_unittest.cc b/chrome/browser/sync/sessions/status_controller_unittest.cc
index 1b3c17f10eb25a8b4aace85f92ad2727c30b28ed..64a00fc9c08353e8018d48825ffb5ef9f06d90ce 100644
--- a/chrome/browser/sync/sessions/status_controller_unittest.cc
+++ b/chrome/browser/sync/sessions/status_controller_unittest.cc
@@ -62,7 +62,8 @@ TEST_F(StatusControllerTest, GetsDirty) {
 
   {
     ScopedModelSafeGroupRestriction r(&status, GROUP_UI);
-    status.mutable_conflict_progress()->AddConflictingItemById(syncable::Id());
+    status.mutable_conflict_progress()->
+        AddSimpleConflictingItemById(syncable::Id());
   }
   EXPECT_TRUE(status.TestAndClearIsDirty());
 
@@ -151,7 +152,7 @@ TEST_F(StatusControllerTest, HasConflictingUpdates) {
     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_ENCRYPTION,

[Nicolas Zea, 2012/02/02 21:53:41]

Any reason you changed this? Should be valid as it was before right?

[rlarocque, 2012/02/03 22:31:15]

When changing the HasConflictingUpdates() function, I almost neglected to factor
the unresolvable conflicts into the result.  I hijacked this test to try to
catch those errors.

I justify this because I think it would be easier to accidentally write a
HasConflictingUpdates() function that ignores unresolvable conflicts that to
write one that would ignore simple conflicts.  

On second thought, I suppose it can't hurt to test both scenarios.  I'll add an
another unit test for this.

         syncable::Id());
     EXPECT_TRUE(status.update_progress()->HasConflictingUpdates());
   }
@@ -181,17 +182,21 @@ TEST_F(StatusControllerTest, TotalNumConflictingItems) {
   {
     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());
 }