Simplify update error message support HTML.

chrome/browser/google/google_update_win.h

 // 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.
 
 #ifndef CHROME_BROWSER_GOOGLE_GOOGLE_UPDATE_WIN_H_
 #define CHROME_BROWSER_GOOGLE_GOOGLE_UPDATE_WIN_H_
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
@@ skipping 58 matching lines @@
   // BeginUpdateCheck is called with |install_update_if_possible| == true.
   virtual void OnUpgradeProgress(int progress,
                                  const base::string16& new_version) = 0;
 
   // Invoked following a successful upgrade. |new_version| indicates the version
   // to which Chrome was updated. This method will only be invoked when
   // BeginUpdateCheck is called with |install_update_if_possible| == true.
   virtual void OnUpgradeComplete(const base::string16& new_version) = 0;
 
   // Invoked following an unrecoverable error, indicated by |error_code|.
-  // |error_message|, if not empty, contains a localized string that may be
-  // presented to the user explaining the nature of the error. |new_version|, if
-  // not empty, indicates the version to which an upgrade attempt was made.
+  // |html_error_message|, if not empty, contains a localized string that may
+  // be presented to the user via html explaining the nature of the error; it
+  // should include the error code because that will not be displayed otherwise.

[grt (UTC plus 2), 2015/07/09 14:33:09]

Ideally, this comment should explain the contract for both implementors and
consumers. How about:

"|html_error_message|, if not empty, must be a localized string containing all
information required by users to act on the error as well as for support staff
to diagnose it (i.e., |error_code| and any other related state)."

[bcwhite, 2015/07/09 14:54:00]

Done.

+  // |new_version|, if not empty, indicates the version to which an upgrade
+  // attempt was made.
   virtual void OnError(GoogleUpdateErrorCode error_code,
-                       const base::string16& error_message,
+                       const base::string16& html_error_message,
                        const base::string16& new_version) = 0;
 
  protected:
   UpdateCheckDelegate() {}
 };
 
 // Begins an asynchronous update check on |task_runner|. If a new version is
 // available and |install_update_if_possible| is true, the new version will be
 // automatically downloaded and installed. |elevation_window| is the window
 // which should own any necessary elevation UI. Methods on |delegate| will be
@@ skipping 10 matching lines @@
 // implementation (see src/google_update/google_update_idl.idl).
 typedef base::Callback<HRESULT(base::win::ScopedComPtr<IGoogleUpdate3Web>*)>
     GoogleUpdate3ClassFactory;
 
 // For use by tests that wish to provide a custom IGoogleUpdate3Web
 // implementation independent of Google Update's.
 void SetGoogleUpdateFactoryForTesting(
     const GoogleUpdate3ClassFactory& google_update_factory);
 
 #endif  // CHROME_BROWSER_GOOGLE_GOOGLE_UPDATE_WIN_H_