Rename FilePath -> base::FilePath in various toplevel directories

chrome_frame/test_utils.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_frame/test_utils.h"
 
 #include <atlbase.h>
 #include <atlwin.h>
 #include <shellapi.h>
 #include <winternl.h>
@@ skipping 14 matching lines @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 const wchar_t kChromeFrameDllName[] = L"npchrome_frame.dll";
 const wchar_t kChromeLauncherExeName[] = L"chrome_launcher.exe";
 // How long to wait for DLLs to register or unregister themselves before killing
 // the registrar.
 const int64 kDllRegistrationTimeoutMs = 30 * 1000;
 
-FilePath GetChromeFrameBuildPath() {
-  FilePath build_path;
+base::FilePath GetChromeFrameBuildPath() {
+  base::FilePath build_path;
   PathService::Get(chrome::DIR_APP, &build_path);
 
-  FilePath dll_path = build_path.Append(kChromeFrameDllName);
+  base::FilePath dll_path = build_path.Append(kChromeFrameDllName);
 
   if (!file_util::PathExists(dll_path)) {
     // Well, dang.. try looking in the current directory.
     dll_path = build_path.Append(kChromeFrameDllName);
   }
 
   if (!file_util::PathExists(dll_path)) {
     // No luck, return something empty.
-    dll_path = FilePath();
+    dll_path = base::FilePath();
   }
 
   return dll_path;
 }
 
 const wchar_t ScopedChromeFrameRegistrar::kCallRegistrationEntrypointSwitch[] =
     L"--call-registration-entrypoint";
 
 bool ScopedChromeFrameRegistrar::register_chrome_path_provider_ = false;
 
@@ skipping 83 matching lines @@
     const std::wstring& path, RegistrationType registration_type) {
   DoRegistration(path, registration_type, REGISTER);
 }
 
 // static
 void ScopedChromeFrameRegistrar::UnregisterAtPath(
     const std::wstring& path, RegistrationType registration_type) {
   DoRegistration(path, registration_type, UNREGISTER);
 }
 
-FilePath ScopedChromeFrameRegistrar::GetReferenceChromeFrameDllPath() {
-  FilePath reference_build_dir;
+base::FilePath ScopedChromeFrameRegistrar::GetReferenceChromeFrameDllPath() {
+  base::FilePath reference_build_dir;
   PathService::Get(chrome::DIR_APP, &reference_build_dir);
 
   reference_build_dir = reference_build_dir.DirName();
   reference_build_dir = reference_build_dir.DirName();
 
   reference_build_dir = reference_build_dir.AppendASCII("chrome_frame");
   reference_build_dir = reference_build_dir.AppendASCII("tools");
   reference_build_dir = reference_build_dir.AppendASCII("test");
   reference_build_dir = reference_build_dir.AppendASCII("reference_build");
   reference_build_dir = reference_build_dir.AppendASCII("chrome");
@@ skipping 69 matching lines @@
   if (!register_chrome_path_provider_) {
     // Register paths needed by the ScopedChromeFrameRegistrar.
     chrome::RegisterPathProvider();
     register_chrome_path_provider_ = true;
   }
   original_dll_path_ = GetChromeFrameBuildPath().value();
   RegisterChromeFrameAtPath(original_dll_path_);
 }
 
 ScopedChromeFrameRegistrar::~ScopedChromeFrameRegistrar() {
-  if (FilePath(original_dll_path_) != FilePath(new_chrome_frame_dll_path_)) {
+  if (base::FilePath(original_dll_path_) !=
+      base::FilePath(new_chrome_frame_dll_path_)) {
     RegisterChromeFrameAtPath(original_dll_path_);
   } else if (registration_type_ == PER_USER) {
     UnregisterAtPath(new_chrome_frame_dll_path_, registration_type_);
     HWND chrome_frame_helper_window =
         FindWindow(L"ChromeFrameHelperWindowClass", NULL);
     if (IsWindow(chrome_frame_helper_window)) {
       PostMessage(chrome_frame_helper_window, WM_CLOSE, 0, 0);
     } else {
       base::KillProcesses(L"chrome_frame_helper.exe", 0, NULL);
     }
@@ skipping 171 matching lines @@
       UOI_NAME,
       name,
       sizeof(name),
       &needed)) {
         is_locked = lstrcmpi(name, L"default") != 0;
     }
     ::CloseDesktop(input_desk);
   }
   return is_locked;
 }