sync: Remove the remaining conflict sets code

chrome/browser/sync/sessions/session_state_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/session_state.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 112 matching lines @@
 
   std::string download_progress_markers[syncable::MODEL_TYPE_COUNT];
   download_progress_markers[syncable::BOOKMARKS] = "test";
   download_progress_markers[syncable::APPS] = "apps";
   scoped_ptr<DictionaryValue> expected_download_progress_markers_value(
       DownloadProgressMarkersToValue(download_progress_markers));
 
   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;
 
   SyncSourceInfo source;
   scoped_ptr<DictionaryValue> expected_source_value(source.ToValue());
 
   SyncSessionSnapshot snapshot(syncer_status,
                                errors,
                                kNumServerChangesRemaining,
                                kIsShareUsable,
                                initial_sync_ended,
                                download_progress_markers,
                                kHasMoreToSync,
                                kIsSilenced,
                                kUnsyncedCount,
-                               kNumBlockingConflictingUpdates,
+                               kNumSimpleConflictingUpdates,
                                kNumConflictingUpdates,
                                kDidCommitItems,
                                source,
                                0,
                                base::Time::Now(),
                                false);
   scoped_ptr<DictionaryValue> value(snapshot.ToValue());
   EXPECT_EQ(14u, value->size());
   ExpectDictDictionaryValue(*expected_syncer_status_value, *value,
                             "syncerStatus");
   ExpectDictDictionaryValue(*expected_errors_value, *value, "errors");
   ExpectDictIntegerValue(kNumServerChangesRemaining, *value,
                          "numServerChangesRemaining");
   ExpectDictBooleanValue(kIsShareUsable, *value, "isShareUsable");
   ExpectDictListValue(*expected_initial_sync_ended_value, *value,
                       "initialSyncEnded");
   ExpectDictDictionaryValue(*expected_download_progress_markers_value,
                             *value, "downloadProgressMarkers");
   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,
                          "didCommitItems");
   ExpectDictDictionaryValue(*expected_source_value, *value, "source");
 }
 
 }  // namespace
 }  // namespace sessions
 }  // namespace browser_sync