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

2 files changed, 14 insertions, 11 deletions

diff --git a/chrome/test/webdriver/webdriver_session.h b/chrome/test/webdriver/webdriver_session.h
index 23395af..9f02c4a 100644
--- a/chrome/test/webdriver/webdriver_session.h
+++ b/chrome/test/webdriver/webdriver_session.h
@@ -24,10 +24,9 @@
 #include "chrome/test/webdriver/webdriver_element_id.h"
 #include "chrome/test/webdriver/webdriver_logging.h"
 
-class FilePath;
-
 namespace base {
 class DictionaryValue;
+class FilePath;
 class ListValue;
 class Value;
 class WaitableEvent;
@@ -120,8 +119,9 @@ class Session {
   Error* SendKeys(const string16& keys);
 
   // Sets the file paths to the file upload control under the given location.
-  Error* DragAndDropFilePaths(const Point& location,
-                              const std::vector<FilePath::StringType>& paths);
+  Error* DragAndDropFilePaths(
+      const Point& location,
+      const std::vector<base::FilePath::StringType>& paths);
 
   // Clicks the mouse at the given location using the given button.
   Error* MouseMoveAndClick(const Point& location,
@@ -315,7 +315,7 @@ class Session {
   Error* WaitForAllViewsToStopLoading();
 
   // Install extension at |path|.
-  Error* InstallExtension(const FilePath& path, std::string* extension_id);
+  Error* InstallExtension(const base::FilePath& path, std::string* extension_id);
 
   Error* GetExtensionsInfo(base::ListValue* extension_ids);
 
@@ -393,7 +393,7 @@ class Session {
 
   const Logger& logger() const;
 
-  const FilePath& temp_dir() const;
+  const base::FilePath& temp_dir() const;
 
   const Capabilities& capabilities() const;
 
diff --git a/chrome/test/webdriver/webdriver_util.h b/chrome/test/webdriver/webdriver_util.h
index af01ee95..937af22 100644
--- a/chrome/test/webdriver/webdriver_util.h
+++ b/chrome/test/webdriver/webdriver_util.h
@@ -15,9 +15,12 @@
 #include "chrome/test/webdriver/webdriver_error.h"
 
 class AutomationId;
-class FilePath;
 class WebViewId;
 
+namespace base {
+class FilePath;
+}
+
 namespace webdriver {
 
 // Generates a random, 32-character hexidecimal ID.
@@ -30,7 +33,7 @@ bool Base64Decode(const std::string& base64, std::string* bytes);
 
 // Unzip the given zip archive, after base64 decoding, into the given directory.
 // Returns true on success.
-bool Base64DecodeAndUnzip(const FilePath& unzip_dir,
+bool Base64DecodeAndUnzip(const base::FilePath& unzip_dir,
                           const std::string& base64,
                           std::string* error_msg);
 
@@ -40,9 +43,9 @@ bool Base64DecodeAndUnzip(const FilePath& unzip_dir,
 // |file| to the unzipped file.
 // TODO(kkania): Remove the ability to parse single zip file entries when
 // the current versions of all WebDriver clients send actual zip files.
-bool UnzipSoleFile(const FilePath& unzip_dir,
+bool UnzipSoleFile(const base::FilePath& unzip_dir,
                    const std::string& bytes,
-                   FilePath* file,
+                   base::FilePath* file,
                    std::string* error_msg);
 
 // Returns the equivalent JSON string for the given value.
@@ -72,7 +75,7 @@ Error* FlattenStringArray(const ListValue* src, string16* dest);
 
 #if defined(OS_MACOSX)
 // Gets the paths to the user and local application directory.
-void GetApplicationDirs(std::vector<FilePath>* app_dirs);
+void GetApplicationDirs(std::vector<base::FilePath>* app_dirs);
 #endif
 
 // Parses a given value.