Add base:: to string16s in chrome/.

chrome/installer/util/chrome_frame_distribution.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 a specific implementation of BrowserDistribution class for
 // Chrome Frame. It overrides the bare minimum of methods necessary to get a
 // Chrome Frame installer that does not interact with Google Chrome or
 // Chromium installations.
 
 #include "chrome/installer/util/chrome_frame_distribution.h"
@@ skipping 10 matching lines @@
 #include "installer_util_strings.h"  // NOLINT
 
 namespace {
 const wchar_t kChromeFrameGuid[] = L"{8BA986DA-5100-405E-AA35-86F34A02ACBF}";
 }
 
 ChromeFrameDistribution::ChromeFrameDistribution()
     : BrowserDistribution(CHROME_FRAME) {
 }
 
-string16 ChromeFrameDistribution::GetAppGuid() {
+base::string16 ChromeFrameDistribution::GetAppGuid() {
   return kChromeFrameGuid;
 }
 
-string16 ChromeFrameDistribution::GetBaseAppName() {
+base::string16 ChromeFrameDistribution::GetBaseAppName() {
   return L"Google Chrome Frame";
 }
 
-string16 ChromeFrameDistribution::GetBrowserProgIdPrefix() {
+base::string16 ChromeFrameDistribution::GetBrowserProgIdPrefix() {
   NOTREACHED();
-  return string16();
+  return base::string16();
 }
 
-string16 ChromeFrameDistribution::GetBrowserProgIdDesc() {
+base::string16 ChromeFrameDistribution::GetBrowserProgIdDesc() {
   NOTREACHED();
-  return string16();
+  return base::string16();
 }
 
-string16 ChromeFrameDistribution::GetShortcutName(ShortcutType shortcut_type) {
+base::string16 ChromeFrameDistribution::GetShortcutName(
+    ShortcutType shortcut_type) {
   switch (shortcut_type) {
     case SHORTCUT_CHROME:
     case SHORTCUT_CHROME_ALTERNATE:
       return installer::GetLocalizedString(IDS_PRODUCT_FRAME_NAME_BASE);
     default:
       NOTREACHED();
-      return string16();
+      return base::string16();
   }
 }
 
-string16 ChromeFrameDistribution::GetInstallSubDir() {
+base::string16 ChromeFrameDistribution::GetInstallSubDir() {
   return L"Google\\Chrome Frame";
 }
 
-string16 ChromeFrameDistribution::GetPublisherName() {
-  const string16& publisher_name =
+base::string16 ChromeFrameDistribution::GetPublisherName() {
+  const base::string16& publisher_name =
       installer::GetLocalizedString(IDS_ABOUT_VERSION_COMPANY_NAME_BASE);
   return publisher_name;
 }
 
-string16 ChromeFrameDistribution::GetAppDescription() {
+base::string16 ChromeFrameDistribution::GetAppDescription() {
   return L"Chrome in a Frame.";
 }
 
-string16 ChromeFrameDistribution::GetLongAppDescription() {
+base::string16 ChromeFrameDistribution::GetLongAppDescription() {
   return L"Chrome in a Frame.";
 }
 
 std::string ChromeFrameDistribution::GetSafeBrowsingName() {
   return "googlechromeframe";
 }
 
-string16 ChromeFrameDistribution::GetStateKey() {
-  string16 key(google_update::kRegPathClientState);
+base::string16 ChromeFrameDistribution::GetStateKey() {
+  base::string16 key(google_update::kRegPathClientState);
   key.append(L"\\");
   key.append(kChromeFrameGuid);
   return key;
 }
 
-string16 ChromeFrameDistribution::GetStateMediumKey() {
-  string16 key(google_update::kRegPathClientStateMedium);
+base::string16 ChromeFrameDistribution::GetStateMediumKey() {
+  base::string16 key(google_update::kRegPathClientStateMedium);
   key.append(L"\\");
   key.append(kChromeFrameGuid);
   return key;
 }
 
 std::string ChromeFrameDistribution::GetNetworkStatsServer() const {
   return chrome_common_net::kEchoTestServerLocation;
 }
 
 std::string ChromeFrameDistribution::GetHttpPipeliningTestServer() const {
   return chrome_common_net::kPipelineTestServerBaseUrl;
 }
 
-string16 ChromeFrameDistribution::GetUninstallLinkName() {
+base::string16 ChromeFrameDistribution::GetUninstallLinkName() {
   return L"Uninstall Chrome Frame";
 }
 
-string16 ChromeFrameDistribution::GetUninstallRegPath() {
+base::string16 ChromeFrameDistribution::GetUninstallRegPath() {
   return L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"
          L"Google Chrome Frame";
 }
 
-string16 ChromeFrameDistribution::GetVersionKey() {
-  string16 key(google_update::kRegPathClients);
+base::string16 ChromeFrameDistribution::GetVersionKey() {
+  base::string16 key(google_update::kRegPathClients);
   key.append(L"\\");
   key.append(kChromeFrameGuid);
   return key;
 }
 
-string16 ChromeFrameDistribution::GetIconFilename() {
+base::string16 ChromeFrameDistribution::GetIconFilename() {
   return installer::kChromeExe;
 }
 
 int ChromeFrameDistribution::GetIconIndex(ShortcutType shortcut_type) {
   switch (shortcut_type) {
     case SHORTCUT_CHROME:
       return 0;
     default:
       NOTREACHED();
       return 0;
   }
 }
 
 BrowserDistribution::DefaultBrowserControlPolicy
     ChromeFrameDistribution::GetDefaultBrowserControlPolicy() {
   return DEFAULT_BROWSER_UNSUPPORTED;
 }
 
 bool ChromeFrameDistribution::CanCreateDesktopShortcuts() {
   return false;
 }
 
 bool ChromeFrameDistribution::GetCommandExecuteImplClsid(
-    string16* handler_class_uuid) {
+    base::string16* handler_class_uuid) {
   return false;
 }
 
 void ChromeFrameDistribution::UpdateInstallStatus(bool system_install,
     installer::ArchiveType archive_type,
     installer::InstallStatus install_status) {
 #if defined(GOOGLE_CHROME_BUILD)
   GoogleUpdateSettings::UpdateInstallStatus(system_install,
       archive_type, InstallUtil::GetInstallReturnCode(install_status),
       kChromeFrameGuid);
 #endif
 }