win: wstring->string16 in chrome/installer/util/html_dialog

chrome/installer/util/html_dialog.h

Index: chrome/installer/util/html_dialog.h
diff --git a/chrome/installer/util/html_dialog.h b/chrome/installer/util/html_dialog.h
index d885c23e3c96c49230131a2977c0b04fabb32664..4b7c6cf58322ddc63de5e8671abcc82be25b64ea 100644
--- a/chrome/installer/util/html_dialog.h
+++ b/chrome/installer/util/html_dialog.h
@@ -8,6 +8,7 @@
 #include <string>

[grt (UTC plus 2), 2015/04/30 02:58:29]

remove

[Nico, 2015/04/30 02:59:20]

string16.h includes <string>, but yeah I guess it's a bit nicer. I'll send you a
patch.

 
 #include "base/basictypes.h"
+#include "base/strings/string16.h"
 
 // This is the interface for creating HTML-based Dialogs *before* Chrome has
 // been installed or when there is a suspicion chrome is not working. In
@@ -54,14 +55,14 @@ class HTMLDialog {
 
   // If the result of ShowModal() was EXTRA, the information is available
   // as a string using this method.
-  virtual std::wstring GetExtraResult() = 0;
+  virtual base::string16 GetExtraResult() = 0;
 };
 
 // Factory method for the native HTML Dialog. When done with the object use
 // regular 'delete' operator to destroy the object. It might choose a
 // different underlying implementation according to the url protocol.
-HTMLDialog* CreateNativeHTMLDialog(const std::wstring& url,
-                                   const std::wstring& param);
+HTMLDialog* CreateNativeHTMLDialog(const base::string16& url,
+                                   const base::string16& param);
 
 // This class leverages HTMLDialog to create a dialog that is suitable
 // for a end-user-agreement modal dialog. The html shows a fairly standard
@@ -72,7 +73,7 @@ class EulaHTMLDialog {
   // |file| points to an html file on disk or to a resource via res:// spec.
   // |param| is a string that will be passed to the dialog as a parameter via
   //         the window.dialogArguments property.
-  EulaHTMLDialog(const std::wstring& file, const std::wstring& param);
+  EulaHTMLDialog(const base::string16& file, const base::string16& param);
   ~EulaHTMLDialog();
 
   enum Outcome {