Fix GetAppShortcutName to return a localized name for Chrome

chrome/installer/util/google_chrome_distribution.h

Index: chrome/installer/util/google_chrome_distribution.h
diff --git a/chrome/installer/util/google_chrome_distribution.h b/chrome/installer/util/google_chrome_distribution.h
index 743bd38a449ef6b8ecef840996b53fe3f6a327ab..4bc4381332979deadbe079731cfdedfe3096acb2 100644
--- a/chrome/installer/util/google_chrome_distribution.h
+++ b/chrome/installer/util/google_chrome_distribution.h
@@ -9,8 +9,7 @@
 #define CHROME_INSTALLER_UTIL_GOOGLE_CHROME_DISTRIBUTION_H_
 #pragma once
 
-#include <string>
-
+#include "base/string16.h"
 #include "base/gtest_prod_util.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/util_constants.h"
@@ -35,29 +34,31 @@ class GoogleChromeDistribution : public BrowserDistribution {
   virtual void DoPostUninstallOperations(
       const Version& version,
       const FilePath& local_data_path,
-      const std::wstring& distribution_data) OVERRIDE;
+      const string16& distribution_data) OVERRIDE;
+
+  virtual string16 GetAppGuid() OVERRIDE;
 
-  virtual std::wstring GetAppGuid() OVERRIDE;
+  virtual string16 GetApplicationName() OVERRIDE;
 
-  virtual std::wstring GetApplicationName() OVERRIDE;
+  virtual string16 GetAppShortCutName() OVERRIDE;
 
-  virtual std::wstring GetAlternateApplicationName() OVERRIDE;
+  virtual string16 GetAlternateApplicationName() OVERRIDE;
 
-  virtual std::wstring GetBrowserAppId() OVERRIDE;
+  virtual string16 GetBrowserAppId() OVERRIDE;
 
-  virtual std::wstring GetInstallSubDir() OVERRIDE;
+  virtual string16 GetInstallSubDir() OVERRIDE;
 
-  virtual std::wstring GetPublisherName() OVERRIDE;
+  virtual string16 GetPublisherName() OVERRIDE;
 
-  virtual std::wstring GetAppDescription() OVERRIDE;
+  virtual string16 GetAppDescription() OVERRIDE;
 
   virtual std::string GetSafeBrowsingName() OVERRIDE;
 
-  virtual std::wstring GetStateKey() OVERRIDE;
+  virtual string16 GetStateKey() OVERRIDE;
 
-  virtual std::wstring GetStateMediumKey() OVERRIDE;
+  virtual string16 GetStateMediumKey() OVERRIDE;
 
-  virtual std::wstring GetStatsServerURL() OVERRIDE;
+  virtual string16 GetStatsServerURL() OVERRIDE;
 
   virtual std::string GetNetworkStatsServer() const OVERRIDE;
 
@@ -66,13 +67,13 @@ class GoogleChromeDistribution : public BrowserDistribution {
   // This method reads data from the Google Update ClientState key for
   // potential use in the uninstall survey. It must be called before the
   // key returned by GetVersionKey() is deleted.
-  virtual std::wstring GetDistributionData(HKEY root_key) OVERRIDE;
+  virtual string16 GetDistributionData(HKEY root_key) OVERRIDE;
 
-  virtual std::wstring GetUninstallLinkName() OVERRIDE;
+  virtual string16 GetUninstallLinkName() OVERRIDE;
 
-  virtual std::wstring GetUninstallRegPath() OVERRIDE;
+  virtual string16 GetUninstallRegPath() OVERRIDE;
 
-  virtual std::wstring GetVersionKey() OVERRIDE;
+  virtual string16 GetVersionKey() OVERRIDE;
 
   virtual bool GetDelegateExecuteHandlerData(string16* handler_class_uuid,
                                              string16* type_lib_uuid,
@@ -99,14 +100,14 @@ class GoogleChromeDistribution : public BrowserDistribution {
   // outcome in the registry.
   virtual void InactiveUserToastExperiment(
       int flavor,
-      const std::wstring& experiment_group,
+      const string16& experiment_group,
       const installer::Product& installation,
       const FilePath& application_path) OVERRIDE;
 
-  const std::wstring& product_guid() { return product_guid_; }
+  const string16& product_guid() { return product_guid_; }
 
  protected:
-  void set_product_guid(const std::wstring& guid) { product_guid_ = guid; }
+  void set_product_guid(const string16& guid) { product_guid_ = guid; }
 
   // Disallow construction from others.
   GoogleChromeDistribution();
@@ -122,21 +123,21 @@ class GoogleChromeDistribution : public BrowserDistribution {
   // Returns true if uninstall_metrics has been successfully populated with
   // the uninstall metrics, false otherwise.
   virtual bool ExtractUninstallMetricsFromFile(
-      const FilePath& file_path, std::wstring* uninstall_metrics);
+      const FilePath& file_path, string16* uninstall_metrics);
 
   // Extracts uninstall metrics from the given JSON value.
   virtual bool ExtractUninstallMetrics(const base::DictionaryValue& root,
-                                       std::wstring* uninstall_metrics);
+                                       string16* uninstall_metrics);
 
   // Given a DictionaryValue containing a set of uninstall metrics,
   // this builds a URL parameter list of all the contained metrics.
   // Returns true if at least one uninstall metric was found in
   // uninstall_metrics_dict, false otherwise.
   virtual bool BuildUninstallMetricsString(
-      base::DictionaryValue* uninstall_metrics_dict, std::wstring* metrics);
+      base::DictionaryValue* uninstall_metrics_dict, string16* metrics);
 
   // The product ID for Google Update.
-  std::wstring product_guid_;
+  string16 product_guid_;
 };
 
 #endif  // CHROME_INSTALLER_UTIL_GOOGLE_CHROME_DISTRIBUTION_H_