Remove broken variables from sync's AllStatus

chrome/browser/sync/profile_sync_service.cc

 // Copyright (c) 2011 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.h"
 
 #include <cstddef>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 991 matching lines @@
   return last_auth_error_;
 }
 
 bool ProfileSyncService::SetupInProgress() const {
   return !HasSyncSetupCompleted() && WizardIsVisible();
 }
 
 std::string ProfileSyncService::BuildSyncStatusSummaryText(
     const sync_api::SyncManager::Status::Summary& summary) {
   const char* strings[] = {"INVALID", "OFFLINE", "OFFLINE_UNSYNCED", "SYNCING",
-      "READY", "CONFLICT", "OFFLINE_UNUSABLE"};
+      "READY", "OFFLINE_UNUSABLE"};
   COMPILE_ASSERT(arraysize(strings) ==
                  sync_api::SyncManager::Status::SUMMARY_STATUS_COUNT,
                  enum_indexed_array);
   if (summary < 0 ||
       summary >= sync_api::SyncManager::Status::SUMMARY_STATUS_COUNT) {
     LOG(DFATAL) << "Illegal Summary Value: " << summary;
     return "UNKNOWN";
   }
   return strings[summary];
 }
@@ skipping 543 matching lines @@
              << "Unrecoverable error.";
   } else {
     DVLOG(0) << "ConfigureDataTypeManager not invoked because backend is not "
              << "initialized";
   }
 }
 
 const FailedDatatypesHandler& ProfileSyncService::failed_datatypes_handler() {
   return failed_datatypes_handler_;
 }