Add base:: to string16s in win8/.

win8/delegate_execute/chrome_util.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 "win8/delegate_execute/chrome_util.h"
 
 #include <windows.h>
 #include <atlbase.h>
 #include <shlobj.h>
 
@@ skipping 27 matching lines @@
 const base::FilePath::CharType kNewChromeExe[] =
     FILE_PATH_LITERAL("new_chrome.exe");
 const wchar_t kRenameCommandValue[] = L"cmd";
 const wchar_t kRegPathChromeClientBase[] =
     L"Software\\Google\\Update\\Clients\\";
 
 // Returns the name of the global event used to detect if |chrome_exe| is in
 // use by a browser process.
 // TODO(grt): Move this somewhere central so it can be used by both this
 // IsBrowserRunning (below) and IsBrowserAlreadyRunning (browser_util_win.cc).
-string16 GetEventName(const base::FilePath& chrome_exe) {
+base::string16 GetEventName(const base::FilePath& chrome_exe) {
   static wchar_t const kEventPrefix[] = L"Global\\";
   const size_t prefix_len = arraysize(kEventPrefix) - 1;
-  string16 name;
+  base::string16 name;
   name.reserve(prefix_len + chrome_exe.value().size());
   name.assign(kEventPrefix, prefix_len);
   name.append(chrome_exe.value());
   std::replace(name.begin() + prefix_len, name.end(), '\\', '!');
   std::transform(name.begin() + prefix_len, name.end(),
                  name.begin() + prefix_len, tolower);
   return name;
 }
 
 // Returns true if |chrome_exe| is in use by a browser process. In this case,
@@ skipping 11 matching lines @@
   return false;
 }
 
 // Returns true if the file new_chrome.exe exists in the same directory as
 // |chrome_exe|.
 bool NewChromeExeExists(const base::FilePath& chrome_exe) {
   base::FilePath new_chrome_exe(chrome_exe.DirName().Append(kNewChromeExe));
   return base::PathExists(new_chrome_exe);
 }
 
-bool GetUpdateCommand(bool is_per_user, string16* update_command) {
+bool GetUpdateCommand(bool is_per_user, base::string16* update_command) {
   const HKEY root = is_per_user ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE;
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-  string16 reg_path_chrome_client = kRegPathChromeClientBase;
+  base::string16 reg_path_chrome_client = kRegPathChromeClientBase;
   reg_path_chrome_client.append(dist->GetAppGuid());
   base::win::RegKey key(root, reg_path_chrome_client.c_str(), KEY_QUERY_VALUE);
 
   return key.ReadValue(kRenameCommandValue, update_command) == ERROR_SUCCESS;
 }
 
 #endif  // GOOGLE_CHROME_BUILD
 
 }  // namespace
 
 namespace delegate_execute {
 
 void UpdateChromeIfNeeded(const base::FilePath& chrome_exe) {
 #if defined(GOOGLE_CHROME_BUILD)
   // Nothing to do if a browser is already running or if there's no
   // new_chrome.exe.
   if (IsBrowserRunning(chrome_exe) || !NewChromeExeExists(chrome_exe))
     return;
 
   base::win::ScopedHandle process_handle;
 
   if (InstallUtil::IsPerUserInstall(chrome_exe.value().c_str())) {
     // Read the update command from the registry.
-    string16 update_command;
+    base::string16 update_command;
     if (!GetUpdateCommand(true, &update_command)) {
       AtlTrace("%hs. Failed to read update command from registry.\n",
                __FUNCTION__);
     } else {
       // Run the update command.
       base::LaunchOptions launch_options;
       launch_options.start_hidden = true;
       if (!base::LaunchProcess(update_command, launch_options,
                                &process_handle)) {
         AtlTrace("%hs. Failed to launch command to finalize update; "
@@ skipping 34 matching lines @@
       AtlTrace("%hs. Failed to finalize update with exit code %d.\n",
                __FUNCTION__, exit_code);
     } else {
       AtlTrace("%hs. Finalized pending update.\n", __FUNCTION__);
     }
   }
 #endif
 }
 
 }  // delegate_execute