Add FilePath to base namespace.

This updates headers that forward-declare it and a few random places to use the namespace explicitly. There us a using declaration in file_path.h that makes the rest compile, which we can do in future passes.
Review URL: https://codereview.chromium.org/12163003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180245 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 23 insertions, 12 deletions

diff --git a/chrome_frame/chrome_launcher_utils.h b/chrome_frame/chrome_launcher_utils.h
index a4b79e9..d13f4b0 100644
--- a/chrome_frame/chrome_launcher_utils.h
+++ b/chrome_frame/chrome_launcher_utils.h
@@ -9,7 +9,10 @@
 #include "base/memory/scoped_ptr.h"
 
 class CommandLine;
+
+namespace base {
 class FilePath;
+}
 
 namespace chrome_launcher {
 
@@ -35,7 +38,7 @@ bool CreateUpdateCommandLine(const std::wstring& update_command,
                              scoped_ptr<CommandLine>* command_line);
 
 // Returns the full path to the Chrome executable.
-FilePath GetChromeExecutablePath();
+base::FilePath GetChromeExecutablePath();
 
 }  // namespace chrome_launcher
 
diff --git a/chrome_frame/test/chrome_frame_test_utils.h b/chrome_frame/test/chrome_frame_test_utils.h
index f53eefd..59b00ef 100644
--- a/chrome_frame/test/chrome_frame_test_utils.h
+++ b/chrome_frame/test/chrome_frame_test_utils.h
@@ -37,16 +37,19 @@
 #define GMOCK_MUTANT_INCLUDE_LATE_OBJECT_BINDING
 #include "testing/gmock_mutant.h"
 
-class FilePath;
 interface IWebBrowser2;
 
+namespace base {
+class FilePath;
+}
+
 namespace chrome_frame_test {
 
 int CloseVisibleWindowsOnAllThreads(HANDLE process);
 
 base::ProcessHandle LaunchIE(const std::wstring& url);
 base::ProcessHandle LaunchChrome(const std::wstring& url,
-                                 const FilePath& user_data_dir);
+                                 const base::FilePath& user_data_dir);
 
 // Attempts to close all open IE windows.
 // The return value is the number of windows closed.
@@ -243,7 +246,7 @@ class TimedMsgLoop {
 
  private:
   static void SnapshotAndQuit() {
-    FilePath snapshot;
+    base::FilePath snapshot;
     if (ui_test_utils::SaveScreenSnapshotToDesktop(&snapshot)) {
       testing::UnitTest* unit_test = testing::UnitTest::GetInstance();
       const testing::TestInfo* test_info = unit_test->current_test_info();
@@ -286,7 +289,7 @@ HRESULT LaunchIEAsComServer(IWebBrowser2** web_browser);
 std::wstring GetExecutableAppPath(const std::wstring& file);
 
 // Returns the profile path to be used for IE. This varies as per version.
-FilePath GetProfilePathForIE();
+base::FilePath GetProfilePathForIE();
 
 // Returns the version of the exe passed in.
 std::wstring GetExeVersion(const std::wstring& exe_path);
@@ -295,10 +298,10 @@ std::wstring GetExeVersion(const std::wstring& exe_path);
 IEVersion GetInstalledIEVersion();
 
 // Returns the folder for CF test data.
-FilePath GetTestDataFolder();
+base::FilePath GetTestDataFolder();
 
 // Returns the folder for Selenium core.
-FilePath GetSeleniumTestFolder();
+base::FilePath GetSeleniumTestFolder();
 
 // Returns the path portion of the url.
 std::wstring GetPathFromUrl(const std::wstring& url);
diff --git a/chrome_frame/test_utils.h b/chrome_frame/test_utils.h
index f07bfbe..6366ad9 100644
--- a/chrome_frame/test_utils.h
+++ b/chrome_frame/test_utils.h
@@ -12,7 +12,9 @@
 
 #include "base/string16.h"
 
+namespace base {
 class FilePath;
+}
 
 extern const wchar_t kChromeFrameDllName[];
 extern const wchar_t kChromeLauncherExeName[];
@@ -50,7 +52,7 @@ class ScopedChromeFrameRegistrar {
   static void UnregisterAtPath(const std::wstring& path,
                                RegistrationType registration_type);
   static void RegisterDefaults();
-  static FilePath GetReferenceChromeFrameDllPath();
+  static base::FilePath GetReferenceChromeFrameDllPath();
 
   // Registers or unregisters a COM DLL and exits the process if the process's
   // command line is:
@@ -89,7 +91,7 @@ class ScopedChromeFrameRegistrar {
 // Returns the path to the Chrome Frame DLL in the build directory. Assumes
 // that the test executable is running from the build folder or a similar
 // folder structure.
-FilePath GetChromeFrameBuildPath();
+base::FilePath GetChromeFrameBuildPath();
 
 // Callback description for onload, onloaderror, onmessage
 static _ATL_FUNC_INFO g_single_param = {CC_STDCALL, VT_EMPTY, 1, {VT_VARIANT}};
diff --git a/chrome_frame/utils.h b/chrome_frame/utils.h
index 2204571..29084db 100644
--- a/chrome_frame/utils.h
+++ b/chrome_frame/utils.h
@@ -20,12 +20,15 @@
 #include "googleurl/src/gurl.h"
 #include "ui/gfx/rect.h"
 
-class FilePath;
 class RegistryListPreferencesHolder;
 interface IBrowserService;
 interface IWebBrowser2;
 struct ContextMenuModel;
 
+namespace base {
+class FilePath;
+}
+
 // utils.h : Various utility functions and classes
 extern const char kGCFProtocol[];
 
@@ -207,7 +210,7 @@ IEVersion GetIEVersion();
 // hosted. Returns 0 if the current process is not IE or any other error occurs.
 uint32 GetIEMajorVersion();
 
-FilePath GetIETemporaryFilesFolder();
+base::FilePath GetIETemporaryFilesFolder();
 
 // Retrieves the file version from a module handle without extra round trips
 // to the disk (as happens with the regular GetFileVersionInfo API).
@@ -601,6 +604,6 @@ bool IncreaseWinInetConnections(DWORD connections);
 // Sets |profile_path| to the path for the Chrome Frame |profile_name|
 // profile.
 void GetChromeFrameProfilePath(const string16& profile_name,
-                               FilePath* profile_path);
+                               base::FilePath* profile_path);
 
 #endif  // CHROME_FRAME_UTILS_H_