sync: Remove the remaining conflict sets code

chrome/browser/sync/profile_sync_service_harness.cc

Index: chrome/browser/sync/profile_sync_service_harness.cc
diff --git a/chrome/browser/sync/profile_sync_service_harness.cc b/chrome/browser/sync/profile_sync_service_harness.cc
index 5cf6e416d70433022c3b295f67d8d272f8cf533e..973d4eb1c35d8850151edd127936287e05bc59ae 100644
--- a/chrome/browser/sync/profile_sync_service_harness.cc
+++ b/chrome/browser/sync/profile_sync_service_harness.cc
@@ -770,7 +770,7 @@ ProfileSyncService::Status ProfileSyncServiceHarness::GetStatus() {
 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() &&
@@ -1007,8 +1007,8 @@ std::string ProfileSyncServiceHarness::GetClientInfoString(
          << 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: "