Simplify update error message support HTML.

chrome/browser/google/google_update_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 "chrome/browser/google/google_update_win.h"
 
 #include <atlbase.h>
 #include <atlcom.h>
 
 #include "base/bind.h"
@@ skipping 196 matching lines @@
 
   // Starts an update check.
   void BeginUpdateCheck();
 
   // Returns the result of initiating an update check. Sets |error_code| if the
   // result is any kind of failure.
   HRESULT BeginUpdateCheckInternal(GoogleUpdateErrorCode* error_code);
 
   // Sets status_ to UPGRADE_ERROR, error_code_ to |error_code|, hresult_ to
   // |hresult|, installer_exit_code_ to |installer_exit_code|, and
-  // error_message_ to a composition of all values suitable for display to the
-  // user. This call should be followed by deletion of the driver, which will
-  // result in the caller being notified via its delegate.
+  // html_error_message_ to a composition of all values suitable for display
+  // to the user. This call should be followed by deletion of the driver,
+  // which will result in the caller being notified via its delegate.
   void OnUpgradeError(GoogleUpdateErrorCode error_code,
                       HRESULT hresult,
                       int installer_exit_code,
                       const base::string16& error_string);
 
   // Returns true if |current_state| and |state_value| can be obtained from the
   // ongoing update check. Otherwise, populates |hresult| with the reason they
   // could not be obtained.
   bool GetCurrentState(base::win::ScopedComPtr<ICurrentState>* current_state,
                        CurrentState* state_value,
@@ skipping 78 matching lines @@
   // The application being updated (Chrome, Chrome Binaries, or Chrome SxS).
   base::win::ScopedComPtr<IAppWeb> app_;
 
   // The progress value reported most recently to the caller.
   int last_reported_progress_;
 
   // The results of the update check to be logged via UMA and/or reported to the
   // caller.
   GoogleUpdateUpgradeStatus status_;
   GoogleUpdateErrorCode error_code_;
-  base::string16 error_message_;
+  base::string16 html_error_message_;
   base::string16 new_version_;
   HRESULT hresult_;
   int installer_exit_code_;
 
   DISALLOW_COPY_AND_ASSIGN(UpdateCheckDriver);
 };
 
 // static
 void UpdateCheckDriver::RunUpdateCheck(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
@@ skipping 43 matching lines @@
                               NUM_ERROR_CODES);
     if (FAILED(hresult_))
       UMA_HISTOGRAM_SPARSE_SLOWLY("GoogleUpdate.ErrorHresult", hresult_);
     if (installer_exit_code_ != -1) {
       UMA_HISTOGRAM_SPARSE_SLOWLY("GoogleUpdate.InstallerExitCode",
                                   installer_exit_code_);
     }
   }
   if (delegate_) {
     if (status_ == UPGRADE_ERROR)
-      delegate_->OnError(error_code_, error_message_, new_version_);
+      delegate_->OnError(error_code_, html_error_message_, new_version_);
     else if (install_update_if_possible_)
       delegate_->OnUpgradeComplete(new_version_);
     else
       delegate_->OnUpdateCheckComplete(new_version_);
   }
 }
 
 void UpdateCheckDriver::BeginUpdateCheck() {
   GoogleUpdateErrorCode error_code = GOOGLE_UPDATE_NO_ERROR;
   HRESULT hresult = BeginUpdateCheckInternal(&error_code);
@@ skipping 271 matching lines @@
 
   if (!GetCurrentState(&state, &state_value, &hresult)) {
     OnUpgradeError(GOOGLE_UPDATE_ONDEMAND_CLASS_REPORTED_ERROR, hresult, -1,
                    base::string16());
   } else if (IsErrorState(state, state_value, &error_code, &hresult,
                           &installer_exit_code, &error_string)) {
     OnUpgradeError(error_code, hresult, installer_exit_code, error_string);
   } else if (IsFinalState(state, state_value, &upgrade_status, &new_version)) {
     status_ = upgrade_status;
     error_code_ = GOOGLE_UPDATE_NO_ERROR;
-    error_message_.clear();
+    html_error_message_.clear();
     if (!new_version.empty())
       new_version_ = new_version;
     hresult_ = S_OK;
     installer_exit_code_ = -1;
   } else if (IsIntermediateState(state, state_value, &new_version, &progress)) {
     bool got_new_version = new_version_.empty() && !new_version.empty();
     if (got_new_version)
       new_version_ = new_version;
     // Give the caller this status update if it differs from the last one given.
     if (got_new_version || progress != last_reported_progress_) {
@@ skipping 27 matching lines @@
 }
 
 void UpdateCheckDriver::OnUpgradeError(GoogleUpdateErrorCode error_code,
                                        HRESULT hresult,
                                        int installer_exit_code,
                                        const base::string16& error_string) {
   status_ = UPGRADE_ERROR;
   error_code_ = error_code;
   hresult_ = hresult;
   installer_exit_code_ = installer_exit_code;
-  base::string16 error_msg =
+  base::string16 html_error_msg =
       base::StringPrintf(L"%d: <a href='%ls0x%X' target=_blank>0x%X</a>",
                          error_code_, base::UTF8ToUTF16(
                              chrome::kUpgradeHelpCenterBaseURL).c_str(),
                          hresult_, hresult_);
   if (installer_exit_code_ != -1)
-    error_msg += base::StringPrintf(L": %d", installer_exit_code_);
+    html_error_msg += base::StringPrintf(L": %d", installer_exit_code_);
   if (system_level_install_)
-    error_msg += L" -- system level";
+    html_error_msg += L" -- system level";
   if (error_string.empty()) {
-    error_message_ = l10n_util::GetStringFUTF16(
-        IDS_ABOUT_BOX_ERROR_UPDATE_CHECK_FAILED, error_msg);
+    html_error_message_ = l10n_util::GetStringFUTF16(
+        IDS_ABOUT_BOX_ERROR_UPDATE_CHECK_FAILED, html_error_msg);
   } else {
-    error_message_ = l10n_util::GetStringFUTF16(
-        IDS_ABOUT_BOX_GOOGLE_UPDATE_ERROR, error_string, error_msg);
+    html_error_message_ = l10n_util::GetStringFUTF16(
+        IDS_ABOUT_BOX_GOOGLE_UPDATE_ERROR, error_string, html_error_msg);
   }
 }
 
 }  // namespace
 
 
 // Globals ---------------------------------------------------------------------
 
 void BeginUpdateCheck(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
@@ skipping 13 matching lines @@
     const GoogleUpdate3ClassFactory& google_update_factory) {
   if (g_google_update_factory) {
     delete g_google_update_factory;
     g_google_update_factory = nullptr;
   }
   if (!google_update_factory.is_null()) {
     g_google_update_factory =
         new GoogleUpdate3ClassFactory(google_update_factory);
   }
 }