sync: Remove the remaining conflict sets code

chrome/browser/sync/sessions/session_state_unittest.cc

Index: chrome/browser/sync/sessions/session_state_unittest.cc
diff --git a/chrome/browser/sync/sessions/session_state_unittest.cc b/chrome/browser/sync/sessions/session_state_unittest.cc
index 244ece8e8f2b15b78850a28a744c8bb6d58309c4..5a3732473b9f00de72e8861951e152087d467dc7 100644
--- a/chrome/browser/sync/sessions/session_state_unittest.cc
+++ b/chrome/browser/sync/sessions/session_state_unittest.cc
@@ -130,7 +130,7 @@ TEST_F(SessionStateTest, SyncSessionSnapshotToValue) {
   const bool kHasMoreToSync = false;
   const bool kIsSilenced = true;
   const int kUnsyncedCount = 1053;
-  const int kNumBlockingConflictingUpdates = 1054;
+  const int kNumSimpleConflictingUpdates = 1054;
   const int kNumConflictingUpdates = 1055;
   const bool kDidCommitItems = true;
 
@@ -146,7 +146,7 @@ TEST_F(SessionStateTest, SyncSessionSnapshotToValue) {
                                kHasMoreToSync,
                                kIsSilenced,
                                kUnsyncedCount,
-                               kNumBlockingConflictingUpdates,
+                               kNumSimpleConflictingUpdates,
                                kNumConflictingUpdates,
                                kDidCommitItems,
                                source,
@@ -168,8 +168,8 @@ TEST_F(SessionStateTest, SyncSessionSnapshotToValue) {
   ExpectDictBooleanValue(kHasMoreToSync, *value, "hasMoreToSync");
   ExpectDictBooleanValue(kIsSilenced, *value, "isSilenced");
   ExpectDictIntegerValue(kUnsyncedCount, *value, "unsyncedCount");
-  ExpectDictIntegerValue(kNumBlockingConflictingUpdates, *value,
-                         "numBlockingConflictingUpdates");
+  ExpectDictIntegerValue(kNumSimpleConflictingUpdates, *value,
+                         "numSimpleConflictingUpdates");
   ExpectDictIntegerValue(kNumConflictingUpdates, *value,
                          "numConflictingUpdates");
   ExpectDictBooleanValue(kDidCommitItems, *value,