[Sync] Display correct message for actionable error

chrome/browser/sync/sync_ui_util.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/sync_ui_util.h"
 
 #include <stdint.h>
 
+#include <string>
+
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/time_formatting.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/signin_error_controller_factory.h"
 #include "chrome/browser/signin/signin_ui_util.h"
@@ skipping 140 matching lines @@
   if (!signin.IsAuthenticated())
     return PRE_SYNCED;
 
   if (!service || service->IsManaged() || service->IsFirstSetupComplete() ||
       !service->IsSyncRequested()) {
     // The order or priority is going to be: 1. Unrecoverable errors.
     // 2. Auth errors. 3. Protocol errors. 4. Passphrase errors.
 
     if (service && service->HasUnrecoverableError()) {
       if (status_label) {
-        status_label->assign(l10n_util::GetStringFUTF16(
-            IDS_SYNC_STATUS_UNRECOVERABLE_ERROR,
-            l10n_util::GetStringUTF16(IDS_SYNC_UNRECOVERABLE_ERROR_HELP_URL)));
+        // Unrecoverable error is sometimes accompanied by actionable error.
+        // If actionable error is set then display corresponding message,
+        // otherwise show generic unrecoverable error message.
+        ProfileSyncService::Status status;
+        service->QueryDetailedSyncStatus(&status);
+        if (ShouldShowActionOnUI(status.sync_protocol_error)) {
+          GetStatusForActionableError(status.sync_protocol_error, status_label);
+        } else {
+          status_label->assign(l10n_util::GetStringFUTF16(
+              IDS_SYNC_STATUS_UNRECOVERABLE_ERROR,
+              l10n_util::GetStringUTF16(
+                  IDS_SYNC_UNRECOVERABLE_ERROR_HELP_URL)));
+        }
       }
       return SYNC_ERROR;
     }
 
     // For auth errors first check if an auth is in progress.
     if (signin.AuthInProgress()) {
       if (status_label) {
         status_label->assign(
           l10n_util::GetStringUTF16(IDS_SYNC_AUTHENTICATING_LABEL));
       }
@@ skipping 216 matching lines @@
 base::string16 ConstructTime(int64_t time_in_int) {
   base::Time time = base::Time::FromInternalValue(time_in_int);
 
   // If time is null the format function returns a time in 1969.
   if (time.is_null())
     return base::string16();
   return base::TimeFormatFriendlyDateAndTime(time);
 }
 
 }  // namespace sync_ui_util