Simplify update error message support HTML.

chrome/browser/ui/webui/help/version_updater_win.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 "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "base/task_runner_util.h"
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 24 matching lines @@
   // VersionUpdater:
   void CheckForUpdate(const StatusCallback& callback) override;
   void RelaunchBrowser() const override;
 
   // UpdateCheckDelegate:
   void OnUpdateCheckComplete(const base::string16& new_version) override;
   void OnUpgradeProgress(int progress,
                          const base::string16& new_version) override;
   void OnUpgradeComplete(const base::string16& new_version) override;
   void OnError(GoogleUpdateErrorCode error_code,
-               const base::string16& error_message,
+               const base::string16& html_error_message,
                const base::string16& new_version) override;
 
  private:
   void BeginUpdateCheckOnFileThread(bool install_update_if_possible);
 
   // A task run on the UI thread with the result of checking for a pending
   // restart.
   void OnPendingRestartCheck(bool is_update_pending_restart);
 
   // The widget owning the UI for the update check.
@@ skipping 69 matching lines @@
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   callback_.Run(UPDATING, progress, base::string16());
 }
 
 void VersionUpdaterWin::OnUpgradeComplete(const base::string16& new_version) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   callback_.Run(NEARLY_UPDATED, 0, base::string16());
 }
 
 void VersionUpdaterWin::OnError(GoogleUpdateErrorCode error_code,
-                                const base::string16& error_message,
+                                const base::string16& html_error_message,
                                 const base::string16& new_version) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   base::string16 message;
 
-  // Current versions of Google Update provide a nice message for the policy
-  // case. Use this generic error for the policy case only if no message from
-  // Google Update is present.
-  if (error_code != GOOGLE_UPDATE_DISABLED_BY_POLICY || error_message.empty())
+  // html_error_message already mentions error_code so don't combine messages.
+  if (html_error_message.empty()) {
     message = l10n_util::GetStringFUTF16Int(IDS_UPGRADE_ERROR, error_code);
-
-  if (!error_message.empty()) {
-    message += l10n_util::GetStringFUTF16(
-        IDS_ABOUT_BOX_ERROR_DURING_UPDATE_CHECK, error_message);
+  } else {
+    message = l10n_util::GetStringFUTF16(
+        IDS_ABOUT_BOX_ERROR_DURING_UPDATE_CHECK, html_error_message);
   }
   callback_.Run(FAILED, 0, message);
 }
 
 void VersionUpdaterWin::BeginUpdateCheckOnFileThread(
     bool install_update_if_possible) {
   BeginUpdateCheck(content::BrowserThread::GetMessageLoopProxyForThread(
                        content::BrowserThread::FILE),
                    g_browser_process->GetApplicationLocale(),
                    install_update_if_possible, owner_widget_,
@@ skipping 13 matching lines @@
   // this this window will no longer have focus by the time UAC is needed. In
   // that case, the UAC prompt will appear in the taskbar and will require a
   // user click. This is the least surprising thing we can do for the user, and
   // is the intended behavior for Windows applications. It's also possible that
   // the browser window hosting the update check will have been closed by the
   // time the UAC prompt is needed. This will behave similarly.
   return new VersionUpdaterWin(web_contents->GetTopLevelNativeWindow()
                                    ->GetHost()
                                    ->GetAcceleratedWidget());
 }