sync: Remove the remaining conflict sets code

chrome/browser/sync/profile_sync_service_harness.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/profile_sync_service_harness.h"
 
 #include <cstddef>
 #include <iterator>
 #include <ostream>
 #include <set>
@@ skipping 752 matching lines @@
 ProfileSyncService::Status ProfileSyncServiceHarness::GetStatus() {
   DCHECK(service() != NULL) << "GetStatus(): service() is NULL.";
   return service()->QueryDetailedSyncStatus();
 }
 
 // We use this function to share code between IsFullySynced and IsDataSynced
 // while ensuring that all conditions are evaluated using on the same snapshot.
 bool ProfileSyncServiceHarness::IsDataSyncedImpl(
     const browser_sync::sessions::SyncSessionSnapshot *snap) {
   return snap &&
-      snap->num_blocking_conflicting_updates == 0 &&
+      snap->num_simple_conflicting_updates == 0 &&
       ServiceIsPushingChanges() &&
       GetStatus().notifications_enabled &&
       !service()->HasUnsyncedItems() &&
       !snap->has_more_to_sync &&
       !HasPendingBackendMigration();
 }
 
 bool ProfileSyncServiceHarness::IsDataSynced() {
   if (service() == NULL) {
     DVLOG(1) << GetClientInfoString("IsDataSynced(): false");
@@ skipping 216 matching lines @@
     if (snap) {
       // Capture select info from the sync session snapshot and syncer status.
       os << "has_more_to_sync: "
          << snap->has_more_to_sync
          << ", has_unsynced_items: "
          << service()->HasUnsyncedItems()
          << ", unsynced_count: "
          << snap->unsynced_count
          << ", num_conflicting_updates: "
          << snap->num_conflicting_updates
-         << ", num_blocking_conflicting_updates: "
-         << snap->num_blocking_conflicting_updates
+         << ", num_simple_conflicting_updates: "
+         << snap->num_simple_conflicting_updates
          << ", num_updates_downloaded : "
          << snap->syncer_status.num_updates_downloaded_total
          << ", passphrase_required_reason: "
          << sync_api::PassphraseRequiredReasonToString(
              service()->passphrase_required_reason())
          << ", notifications_enabled: "
          << status.notifications_enabled
          << ", service_is_pushing_changes: "
          << ServiceIsPushingChanges()
          << ", has_pending_backend_migration: "
@@ skipping 85 matching lines @@
   return state_map.size();
 }
 
 std::string ProfileSyncServiceHarness::GetServiceStatus() {
   DictionaryValue value;
   sync_ui_util::ConstructAboutInformation(service_, &value);
   std::string service_status;
   base::JSONWriter::Write(&value, true, &service_status);
   return service_status;
 }