Fix GetAppShortcutName to return a localized name for Chrome

chrome/installer/util/google_chrome_distribution_dummy.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.
 //
 // This file defines dummy implementation of several functions from the
 // BrowserDistribution class for Google Chrome. These functions allow 64-bit
 // Windows Chrome binary to build successfully. Since this binary is only used
 // for Native Client support, most of the install/uninstall functionality is not
 // necessary there.
 
 #include "chrome/installer/util/google_chrome_distribution.h"
 
 #include <windows.h>
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/values.h"
 
 GoogleChromeDistribution::GoogleChromeDistribution()
     : BrowserDistribution(CHROME_BROWSER) {
 }
 
 void GoogleChromeDistribution::DoPostUninstallOperations(
     const Version& version,
     const FilePath& local_data_path,
-    const std::wstring& distribution_data) {
+    const string16& distribution_data) {
 }
 
-std::wstring GoogleChromeDistribution::GetAppGuid() {
+string16 GoogleChromeDistribution::GetAppGuid() {
   NOTREACHED();
-  return std::wstring();
+  return string16();
 }
 
-std::wstring GoogleChromeDistribution::GetApplicationName() {
+string16 GoogleChromeDistribution::GetApplicationName() {
   NOTREACHED();
-  return std::wstring();
+  return string16();
 }
 
-std::wstring GoogleChromeDistribution::GetAlternateApplicationName() {
+string16 GoogleChromeDistribution::GetAppShortCutName() {
   NOTREACHED();
-  return std::wstring();
+  return string16();
 }
 
-std::wstring GoogleChromeDistribution::GetBrowserAppId() {
+string16 GoogleChromeDistribution::GetAlternateApplicationName() {
   NOTREACHED();
-  return std::wstring();
+  return string16();
 }
 
-std::wstring GoogleChromeDistribution::GetInstallSubDir() {
+string16 GoogleChromeDistribution::GetBrowserAppId() {
   NOTREACHED();
-  return std::wstring();
+  return string16();
 }
 
-std::wstring GoogleChromeDistribution::GetPublisherName() {
+string16 GoogleChromeDistribution::GetInstallSubDir() {
   NOTREACHED();
-  return std::wstring();
+  return string16();
 }
 
-std::wstring GoogleChromeDistribution::GetAppDescription() {
+string16 GoogleChromeDistribution::GetPublisherName() {
   NOTREACHED();
-  return std::wstring();
+  return string16();
+}
+
+string16 GoogleChromeDistribution::GetAppDescription() {
+  NOTREACHED();
+  return string16();
 }
 
 std::string GoogleChromeDistribution::GetSafeBrowsingName() {
   NOTREACHED();
   return std::string();
 }
 
-std::wstring GoogleChromeDistribution::GetStateKey() {
+string16 GoogleChromeDistribution::GetStateKey() {
   NOTREACHED();
-  return std::wstring();
+  return string16();
 }
 
-std::wstring GoogleChromeDistribution::GetStateMediumKey() {
+string16 GoogleChromeDistribution::GetStateMediumKey() {
   NOTREACHED();
-  return std::wstring();
+  return string16();
 }
 
-std::wstring GoogleChromeDistribution::GetStatsServerURL() {
+string16 GoogleChromeDistribution::GetStatsServerURL() {
   NOTREACHED();
-  return std::wstring();
+  return string16();
 }
 
 std::string GoogleChromeDistribution::GetNetworkStatsServer() const {
   NOTREACHED();
   return std::string();
 }
 
 std::string GoogleChromeDistribution::GetHttpPipeliningTestServer() const {
   NOTREACHED();
   return std::string();
 }
 
-std::wstring GoogleChromeDistribution::GetDistributionData(HKEY root_key) {
+string16 GoogleChromeDistribution::GetDistributionData(HKEY root_key) {
   NOTREACHED();
-  return std::wstring();
+  return string16();
 }
 
-std::wstring GoogleChromeDistribution::GetUninstallLinkName() {
+string16 GoogleChromeDistribution::GetUninstallLinkName() {
   NOTREACHED();
-  return std::wstring();
+  return string16();
 }
 
-std::wstring GoogleChromeDistribution::GetUninstallRegPath() {
+string16 GoogleChromeDistribution::GetUninstallRegPath() {
   NOTREACHED();
-  return std::wstring();
+  return string16();
 }
 
-std::wstring GoogleChromeDistribution::GetVersionKey() {
+string16 GoogleChromeDistribution::GetVersionKey() {
   NOTREACHED();
-  return std::wstring();
+  return string16();
 }
 
 bool GoogleChromeDistribution::GetDelegateExecuteHandlerData(
     string16* handler_class_uuid,
     string16* type_lib_uuid,
     string16* type_lib_version,
     string16* interface_uuid) {
   NOTREACHED();
   return false;
 }
@@ skipping 12 matching lines @@
 }
 
 void GoogleChromeDistribution::LaunchUserExperiment(
     const FilePath& setup_path, installer::InstallStatus status,
     const Version& version, const installer::Product& product,
     bool system_level) {
   NOTREACHED();
 }
 
 void GoogleChromeDistribution::InactiveUserToastExperiment(int flavor,
-    const std::wstring& experiment_group,
+    const string16& experiment_group,
     const installer::Product& installation,
     const FilePath& application_path) {
   NOTREACHED();
 }
 
 bool GoogleChromeDistribution::ExtractUninstallMetricsFromFile(
-    const FilePath& file_path, std::wstring* uninstall_metrics_string) {
+    const FilePath& file_path, string16* uninstall_metrics_string) {
   NOTREACHED();
   return false;
 }
 
 bool GoogleChromeDistribution::ExtractUninstallMetrics(
-    const DictionaryValue& root, std::wstring* uninstall_metrics_string) {
+    const DictionaryValue& root, string16* uninstall_metrics_string) {
   NOTREACHED();
   return false;
 }
 
 bool GoogleChromeDistribution::BuildUninstallMetricsString(
-    DictionaryValue* uninstall_metrics_dict, std::wstring* metrics) {
+    DictionaryValue* uninstall_metrics_dict, string16* metrics) {
   NOTREACHED();
   return false;
 }