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

3 files changed, 17 insertions, 10 deletions

diff --git a/chrome/installer/test/alternate_version_generator.h b/chrome/installer/test/alternate_version_generator.h
index 0ae0d5c..fe60a6a 100644
--- a/chrome/installer/test/alternate_version_generator.h
+++ b/chrome/installer/test/alternate_version_generator.h
@@ -9,9 +9,12 @@
 
 #include <string>
 
-class FilePath;
 class Version;
 
+namespace base {
+class FilePath;
+}
+
 namespace upgrade_test {
 
 enum Direction {
@@ -25,8 +28,8 @@ enum Direction {
 // |target_path| is clobbered.  Returns true on success.  |original_version| and
 // |new_version|, when non-NULL, are given the original and new version numbers
 // on success.
-bool GenerateAlternateVersion(const FilePath& original_installer_path,
-                              const FilePath& target_path,
+bool GenerateAlternateVersion(const base::FilePath& original_installer_path,
+                              const base::FilePath& target_path,
                               Direction direction,
                               std::wstring* original_version,
                               std::wstring* new_version);
@@ -35,16 +38,16 @@ bool GenerateAlternateVersion(const FilePath& original_installer_path,
 // |target_file|, modifying the version of the copy according to |direction|.
 // Any previous file at |target_file| is clobbered. Returns true on success.
 // Note that |target_file| may still be mutated on failure.
-bool GenerateAlternatePEFileVersion(const FilePath& original_file,
-                                    const FilePath& target_file,
+bool GenerateAlternatePEFileVersion(const base::FilePath& original_file,
+                                    const base::FilePath& target_file,
                                     Direction direction);
 
 // Given a path to a PEImage in |original_file|, copy that file to
 // |target_file|, modifying the version of the copy according to |version|.
 // Any previous file at |target_file| is clobbered. Returns true on success.
 // Note that |target_file| may still be mutated on failure.
-bool GenerateSpecificPEFileVersion(const FilePath& original_file,
-                                   const FilePath& target_file,
+bool GenerateSpecificPEFileVersion(const base::FilePath& original_file,
+                                   const base::FilePath& target_file,
                                    const Version& version);
 
 }  // namespace upgrade_test
diff --git a/chrome/installer/test/resource_loader.h b/chrome/installer/test/resource_loader.h
index 026e21c..b43056c 100644
--- a/chrome/installer/test/resource_loader.h
+++ b/chrome/installer/test/resource_loader.h
@@ -14,7 +14,9 @@
 
 #include "base/basictypes.h"
 
+namespace base {
 class FilePath;
+}
 
 namespace upgrade_test {
 
@@ -25,7 +27,7 @@ class ResourceLoader {
   ~ResourceLoader();
 
   // Loads |pe_image_path| in preparation for loading its resources.
-  bool Initialize(const FilePath& pe_image_path);
+  bool Initialize(const base::FilePath& pe_image_path);
 
   // Places the address and size of the resource |name| of |type| into
   // |resource_data|, returning true on success.  The address of the resource is
diff --git a/chrome/installer/test/resource_updater.h b/chrome/installer/test/resource_updater.h
index dbbca9f..6d6bb9f 100644
--- a/chrome/installer/test/resource_updater.h
+++ b/chrome/installer/test/resource_updater.h
@@ -14,7 +14,9 @@
 
 #include "base/basictypes.h"
 
+namespace base {
 class FilePath;
+}
 
 namespace upgrade_test {
 
@@ -25,12 +27,12 @@ class ResourceUpdater {
   ~ResourceUpdater();
 
   // Loads |pe_image_path| in preparation for updating its resources.
-  bool Initialize(const FilePath& pe_image_path);
+  bool Initialize(const base::FilePath& pe_image_path);
 
   // Replaces the contents of the resource |name| of |type| and |language_id|
   // with the contents of |input_file|, returning true on success.
   bool Update(const std::wstring& name, const std::wstring& type,
-              WORD language_id, const FilePath& input_file);
+              WORD language_id, const base::FilePath& input_file);
 
   // Commits all updates to the file on disk.
   bool Commit();