| Index: chrome/browser/sync/profile_sync_service.cc
|
| diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
|
| index d6a4d8d6ddd5b5f7e336be2f2171008a68f2ef12..692017bcd6075bdeffd17a98801235e8c0a95f57 100644
|
| --- a/chrome/browser/sync/profile_sync_service.cc
|
| +++ b/chrome/browser/sync/profile_sync_service.cc
|
| @@ -1009,7 +1009,7 @@ bool ProfileSyncService::SetupInProgress() const {
|
| 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);
|
|
|