Add base:: to string16s in chrome/.

chrome/installer/launcher_support/chrome_launcher_support.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.
 
 #include "chrome/installer/launcher_support/chrome_launcher_support.h"
 
 #include <windows.h>
 #include <tchar.h>
 
 #include "base/command_line.h"
@@ skipping 32 matching lines @@
 const char kChromeAppLauncher[] = "app-launcher";
 const wchar_t kChromeExe[] = L"chrome.exe";
 const wchar_t kUninstallArgumentsField[] = L"UninstallArguments";
 const wchar_t kUninstallStringField[] = L"UninstallString";
 
 // Reads a string value from the specified product's "ClientState" registry key.
 // Returns true iff the value is present and successfully read.
 bool GetClientStateValue(InstallationLevel level,
                          const wchar_t* app_guid,
                          const wchar_t* value_name,
-                         string16* value) {
+                         base::string16* value) {
   HKEY root_key = (level == USER_LEVEL_INSTALLATION) ?
       HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE;
-  string16 subkey(kGoogleRegClientStateKey);
+  base::string16 subkey(kGoogleRegClientStateKey);
   subkey.append(1, L'\\').append(app_guid);
   base::win::RegKey reg_key;
   // Google Update always uses 32bit hive.
   if (reg_key.Open(root_key, subkey.c_str(),
                    KEY_QUERY_VALUE | KEY_WOW64_32KEY) == ERROR_SUCCESS) {
     if (reg_key.ReadValue(value_name, value) == ERROR_SUCCESS) {
       return true;
     }
   }
   return false;
 }
 
 // Determines whether the specified product has a key in "Clients". This
 // indicates whether the product is installed at the given level.
 bool IsProductInstalled(InstallationLevel level, const wchar_t* app_guid) {
   HKEY root_key = (level == USER_LEVEL_INSTALLATION) ?
       HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE;
-  string16 subkey(kGoogleRegClientsKey);
+  base::string16 subkey(kGoogleRegClientsKey);
   subkey.append(1, L'\\').append(app_guid);
   base::win::RegKey reg_key;
   // Google Update always uses 32bit hive.
   return reg_key.Open(root_key, subkey.c_str(),
                       KEY_QUERY_VALUE | KEY_WOW64_32KEY) == ERROR_SUCCESS &&
       reg_key.HasValue(kRegVersionField);
 }
 
 bool IsAppLauncherEnabledAtLevel(InstallationLevel level) {
-  string16 uninstall_arguments;
+  base::string16 uninstall_arguments;
   if (GetClientStateValue(level,
                           kAppHostAppId,
                           kUninstallArgumentsField,
                           &uninstall_arguments)) {
     return CommandLine::FromString(L"dummy.exe " + uninstall_arguments)
         .HasSwitch(kChromeAppLauncher) &&
         !GetAppHostPathForInstallationLevel(level).empty();
   }
   return false;
 }
 
 // Reads the path to setup.exe from the value "UninstallString" within the
 // specified product's "ClientState" registry key. Returns an empty FilePath if
 // an error occurs or the product is not installed at the specified level.
 base::FilePath GetSetupExeFromRegistry(InstallationLevel level,
                                        const wchar_t* app_guid) {
-  string16 uninstall;
+  base::string16 uninstall;
   if (GetClientStateValue(level, app_guid, kUninstallStringField, &uninstall)) {
     base::FilePath setup_exe_path(uninstall);
     if (base::PathExists(setup_exe_path))
       return setup_exe_path;
   }
   return base::FilePath();
 }
 
 // Returns the path to an installed |exe_file| (e.g. chrome.exe, app_host.exe)
 // at the specified level, given |setup_exe_path| from Omaha client state.
@@ skipping 16 matching lines @@
   }
   return base::FilePath();
 }
 
 }  // namespace
 
 void UninstallLegacyAppLauncher(InstallationLevel level) {
   base::FilePath setup_exe(GetSetupExeFromRegistry(level, kAppHostAppId));
   if (setup_exe.empty())
     return;
-  string16 uninstall_arguments;
+  base::string16 uninstall_arguments;
   if (GetClientStateValue(level,
                           kAppHostAppId,
                           kUninstallArgumentsField,
                           &uninstall_arguments)) {
     CommandLine uninstall_cmd = CommandLine::FromString(
         L"\"" + setup_exe.value() + L"\" " + uninstall_arguments);
 
     VLOG(1) << "Uninstalling legacy app launcher with command line: "
             << uninstall_cmd.GetCommandLineString();
     base::LaunchProcess(uninstall_cmd, base::LaunchOptions(), NULL);
@@ skipping 59 matching lines @@
 bool IsAppLauncherPresent() {
   return GetAppLauncherInstallationState() != NOT_INSTALLED;
 }
 
 bool IsChromeBrowserPresent() {
   return IsProductInstalled(USER_LEVEL_INSTALLATION, kBrowserAppGuid) ||
       IsProductInstalled(SYSTEM_LEVEL_INSTALLATION, kBrowserAppGuid);
 }
 
 }  // namespace chrome_launcher_support