Add FilePath to base namespace.

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 <atlbase.h>
 #include <shlobj.h>
 #include <windows.h>
 
@@ skipping 18 matching lines @@
 #if defined(GOOGLE_CHROME_BUILD)
 const wchar_t kAppUserModelId[] = L"Chrome";
 #else  // GOOGLE_CHROME_BUILD
 const wchar_t kAppUserModelId[] = L"Chromium";
 #endif  // GOOGLE_CHROME_BUILD
 
 #if defined(GOOGLE_CHROME_BUILD)
 
 // TODO(grt): These constants live in installer_util.  Consider moving them
 // into common_constants to allow for reuse.
-const FilePath::CharType kNewChromeExe[] = FILE_PATH_LITERAL("new_chrome.exe");
+const base::FilePath::CharType kNewChromeExe[] =
+    FILE_PATH_LITERAL("new_chrome.exe");
 const wchar_t kRenameCommandValue[] = L"cmd";
 const wchar_t kChromeAppGuid[] = L"{8A69D345-D564-463c-AFF1-A69D9E530F96}";
 const wchar_t kRegPathChromeClient[] =
     L"Software\\Google\\Update\\Clients\\"
     L"{8A69D345-D564-463c-AFF1-A69D9E530F96}";
 const int kExitCodeRenameSuccessful = 23;
 
 // 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 FilePath& chrome_exe) {
+string16 GetEventName(const base::FilePath& chrome_exe) {
   static wchar_t const kEventPrefix[] = L"Global\\";
   const size_t prefix_len = arraysize(kEventPrefix) - 1;
   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,
 // "in use" means past ChromeBrowserMainParts::PreMainMessageLoopRunImpl.
-bool IsBrowserRunning(const FilePath& chrome_exe) {
+bool IsBrowserRunning(const base::FilePath& chrome_exe) {
   base::win::ScopedHandle handle(::OpenEvent(
       SYNCHRONIZE, FALSE, GetEventName(chrome_exe).c_str()));
   if (handle.IsValid())
     return true;
   DWORD last_error = ::GetLastError();
   if (last_error != ERROR_FILE_NOT_FOUND) {
     AtlTrace("%hs. Failed to open browser event; error %u.\n", __FUNCTION__,
              last_error);
   }
   return false;
 }
 
 // Returns true if the file new_chrome.exe exists in the same directory as
 // |chrome_exe|.
-bool NewChromeExeExists(const FilePath& chrome_exe) {
-  FilePath new_chrome_exe(chrome_exe.DirName().Append(kNewChromeExe));
+bool NewChromeExeExists(const base::FilePath& chrome_exe) {
+  base::FilePath new_chrome_exe(chrome_exe.DirName().Append(kNewChromeExe));
   return file_util::PathExists(new_chrome_exe);
 }
 
 bool GetUpdateCommand(bool is_per_user, string16* update_command) {
   const HKEY root = is_per_user ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE;
   base::win::RegKey key(root, kRegPathChromeClient, KEY_QUERY_VALUE);
 
   return key.ReadValue(kRenameCommandValue, update_command) == ERROR_SUCCESS;
 }
 
 #endif  // GOOGLE_CHROME_BUILD
 
 // TODO(grt): This code also lives in installer_util.  Refactor for reuse.
-bool IsPerUserInstall(const FilePath& chrome_exe) {
+bool IsPerUserInstall(const base::FilePath& chrome_exe) {
   wchar_t program_files_path[MAX_PATH] = {0};
   if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_PROGRAM_FILES, NULL,
                                 SHGFP_TYPE_CURRENT, program_files_path))) {
     return !StartsWith(chrome_exe.value().c_str(), program_files_path, false);
   } else {
     NOTREACHED();
   }
   return true;
 }
 
@@ skipping 74 matching lines @@
   suffix->reserve(base32_md5.length() + 1);
   suffix->assign(1, L'.');
   suffix->append(base32_md5);
   return true;
 }
 
 }  // namespace
 
 namespace delegate_execute {
 
-void UpdateChromeIfNeeded(const FilePath& chrome_exe) {
+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::ProcessHandle process_handle = base::kNullProcessHandle;
 
   if (IsPerUserInstall(chrome_exe)) {
     // Read the update command from the registry.
@@ skipping 44 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
 }
 
 // TODO(gab): This code also lives in shell_util. Refactor for reuse.
-string16 GetAppId(const FilePath& chrome_exe) {
+string16 GetAppId(const base::FilePath& chrome_exe) {
   string16 app_id(kAppUserModelId);
   string16 suffix;
   if (IsPerUserInstall(chrome_exe) &&
       !GetUserSpecificRegistrySuffix(&suffix)) {
     AtlTrace("%hs. GetUserSpecificRegistrySuffix failed.\n",
               __FUNCTION__);
   }
   return app_id.append(suffix);
 }
 
 }  // delegate_execute