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

android_webview/browser/net/aw_network_delegate.cc

@@ -87,7 +87,7 @@ bool AwNetworkDelegate::OnCanSetCookie(const net::URLRequest& request,
 }
 
 bool AwNetworkDelegate::OnCanAccessFile(const net::URLRequest& request,
-                                        const FilePath& path) const {
+                                        const base::FilePath& path) const {
   return true;
 }
 

android_webview/browser/net/aw_network_delegate.h

@@ -52,7 +52,7 @@ class AwNetworkDelegate : public net::NetworkDelegate {
                               const std::string& cookie_line,
                               net::CookieOptions* options) OVERRIDE;
   virtual bool OnCanAccessFile(const net::URLRequest& request,
-                               const FilePath& path) const OVERRIDE;
+                               const base::FilePath& path) const OVERRIDE;
   virtual bool OnCanThrottleRequest(
       const net::URLRequest& request) const OVERRIDE;
   virtual int OnBeforeSocketStreamConnect(

base/android/path_utils.h

@@ -9,9 +9,10 @@
 
 #include "base/base_export.h"
 
+namespace base {
+
 class FilePath;
 
-namespace base {
 namespace android {
 
 // Retrieves the absolute path to the data directory of the current

base/command_line.h

@@ -23,7 +23,9 @@
 #include "base/base_export.h"
 #include "build/build_config.h"
 
+namespace base {
 class FilePath;
+}
 
 class BASE_EXPORT CommandLine {
  public:
@@ -43,7 +45,7 @@ class BASE_EXPORT CommandLine {
   explicit CommandLine(NoProgram no_program);
 
   // Construct a new command line with |program| as argv[0].
-  explicit CommandLine(const FilePath& program);
+  explicit CommandLine(const base::FilePath& program);
 
   // Construct a new command line from an argument list.
   CommandLine(int argc, const CharType* const* argv);
@@ -92,8 +94,8 @@ class BASE_EXPORT CommandLine {
   const StringVector& argv() const { return argv_; }
 
   // Get and Set the program part of the command line string (the first item).
-  FilePath GetProgram() const;
+  base::FilePath GetProgram() const;
-  void SetProgram(const FilePath& program);
+  void SetProgram(const base::FilePath& program);
 
   // Returns true if this command line contains the given switch.
   // (Switch names are case-insensitive).
@@ -102,7 +104,7 @@ class BASE_EXPORT CommandLine {
   // Returns the value associated with the given switch. If the switch has no
   // value or isn't present, this method returns the empty string.
   std::string GetSwitchValueASCII(const std::string& switch_string) const;
-  FilePath GetSwitchValuePath(const std::string& switch_string) const;
+  base::FilePath GetSwitchValuePath(const std::string& switch_string) const;
   StringType GetSwitchValueNative(const std::string& switch_string) const;
 
   // Get a copy of all switches, along with their values.
@@ -111,7 +113,8 @@ class BASE_EXPORT CommandLine {
   // Append a switch [with optional value] to the command line.
   // Note: Switches will precede arguments regardless of appending order.
   void AppendSwitch(const std::string& switch_string);
-  void AppendSwitchPath(const std::string& switch_string, const FilePath& path);
+  void AppendSwitchPath(const std::string& switch_string,
+                        const base::FilePath& path);
   void AppendSwitchNative(const std::string& switch_string,
                           const StringType& value);
   void AppendSwitchASCII(const std::string& switch_string,
@@ -131,7 +134,7 @@ class BASE_EXPORT CommandLine {
   // AppendArg is primarily for ASCII; non-ASCII input is interpreted as UTF-8.
   // Note: Switches will precede arguments regardless of appending order.
   void AppendArg(const std::string& value);
-  void AppendArgPath(const FilePath& value);
+  void AppendArgPath(const base::FilePath& value);
   void AppendArgNative(const StringType& value);
 
   // Append the switches and arguments from another command line to this one.

base/event_recorder.h

@@ -15,10 +15,10 @@
 #include <windows.h>
 #endif
 
-class FilePath;
-
 namespace base {
 
+class FilePath;
+
 // A class for recording and playing back keyboard and mouse input events.
 //
 // Note - if you record events, and the playback with the windows in

base/file_path.h

@@ -125,6 +125,8 @@
 class Pickle;
 class PickleIterator;
 
+namespace base {
+
 // An abstraction to isolate users from the differences between native
 // pathnames on different platforms.
 class BASE_EXPORT FilePath {
@@ -398,8 +400,13 @@ class BASE_EXPORT FilePath {
   StringType path_;
 };
 
+}  // namespace base
+
+// TODO(brettw) remove this once callers properly use the base namespace.
+using base::FilePath;
+
 // This is required by googletest to print a readable output on test failures.
-BASE_EXPORT extern void PrintTo(const FilePath& path, std::ostream* out);
+BASE_EXPORT extern void PrintTo(const base::FilePath& path, std::ostream* out);
 
 // Macros for string literal initialization of FilePath::CharType[], and for
 // using a FilePath::CharType[] in a printf-style format string.
@@ -419,15 +426,15 @@ namespace BASE_HASH_NAMESPACE {
 #if defined(COMPILER_GCC)
 
 template<>
-struct hash<FilePath> {
+struct hash<base::FilePath> {
-  size_t operator()(const FilePath& f) const {
+  size_t operator()(const base::FilePath& f) const {
-    return hash<FilePath::StringType>()(f.value());
+    return hash<base::FilePath::StringType>()(f.value());
   }
 };
 
 #elif defined(COMPILER_MSVC)
 
-inline size_t hash_value(const FilePath& f) {
+inline size_t hash_value(const base::FilePath& f) {
   return hash_value(f.value());
 }
 

base/file_util.h

@@ -49,19 +49,20 @@ extern bool g_bug108724_debug;
 // Functions that operate purely on a path string w/o touching the filesystem:
 
 // Returns true if the given path ends with a path separator character.
-BASE_EXPORT bool EndsWithSeparator(const FilePath& path);
+BASE_EXPORT bool EndsWithSeparator(const base::FilePath& path);
 
 // Makes sure that |path| ends with a separator IFF path is a directory that
 // exists. Returns true if |path| is an existing directory, false otherwise.
-BASE_EXPORT bool EnsureEndsWithSeparator(FilePath* path);
+BASE_EXPORT bool EnsureEndsWithSeparator(base::FilePath* path);
 
 // Convert provided relative path into an absolute path.  Returns false on
 // error. On POSIX, this function fails if the path does not exist.
-BASE_EXPORT bool AbsolutePath(FilePath* path);
+BASE_EXPORT bool AbsolutePath(base::FilePath* path);
 
 // Returns true if |parent| contains |child|. Both paths are converted to
 // absolute paths before doing the comparison.
-BASE_EXPORT bool ContainsPath(const FilePath& parent, const FilePath& child);
+BASE_EXPORT bool ContainsPath(const base::FilePath& parent,
+                              const base::FilePath& child);
 
 //-----------------------------------------------------------------------------
 // Functions that involve filesystem access or modification:
@@ -74,7 +75,7 @@ BASE_EXPORT bool ContainsPath(const FilePath& parent, const FilePath& child);
 // timestmap of file creation time. If you need to avoid such
 // mis-detection perfectly, you should wait one second before
 // obtaining |file_time|.
-BASE_EXPORT int CountFilesCreatedAfter(const FilePath& path,
+BASE_EXPORT int CountFilesCreatedAfter(const base::FilePath& path,
                                        const base::Time& file_time);
 
 // Returns the total number of bytes used by all the files under |root_path|.
@@ -82,7 +83,7 @@ BASE_EXPORT int CountFilesCreatedAfter(const FilePath& path,
 //
 // This function is implemented using the FileEnumerator class so it is not
 // particularly speedy in any platform.
-BASE_EXPORT int64 ComputeDirectorySize(const FilePath& root_path);
+BASE_EXPORT int64 ComputeDirectorySize(const base::FilePath& root_path);
 
 // Returns the total number of bytes used by all files matching the provided
 // |pattern|, on this |directory| (without recursion). If the path does not
@@ -90,8 +91,8 @@ BASE_EXPORT int64 ComputeDirectorySize(const FilePath& root_path);
 //
 // This function is implemented using the FileEnumerator class so it is not
 // particularly speedy in any platform.
-BASE_EXPORT int64 ComputeFilesSize(const FilePath& directory,
+BASE_EXPORT int64 ComputeFilesSize(const base::FilePath& directory,
-                                   const FilePath::StringType& pattern);
+                                   const base::FilePath::StringType& pattern);
 
 // Deletes the given path, whether it's a file or a directory.
 // If it's a directory, it's perfectly happy to delete all of the
@@ -104,7 +105,7 @@ BASE_EXPORT int64 ComputeFilesSize(const FilePath& directory,
 //
 // WARNING: USING THIS WITH recursive==true IS EQUIVALENT
 //          TO "rm -rf", SO USE WITH CAUTION.
-BASE_EXPORT bool Delete(const FilePath& path, bool recursive);
+BASE_EXPORT bool Delete(const base::FilePath& path, bool recursive);
 
 #if defined(OS_WIN)
 // Schedules to delete the given path, whether it's a file or a directory, until
@@ -112,25 +113,27 @@ BASE_EXPORT bool Delete(const FilePath& path, bool recursive);
 // Note:
 // 1) The file/directory to be deleted should exist in a temp folder.
 // 2) The directory to be deleted must be empty.
-BASE_EXPORT bool DeleteAfterReboot(const FilePath& path);
+BASE_EXPORT bool DeleteAfterReboot(const base::FilePath& path);
 #endif
 
 // Moves the given path, whether it's a file or a directory.
 // If a simple rename is not possible, such as in the case where the paths are
 // on different volumes, this will attempt to copy and delete. Returns
 // true for success.
-BASE_EXPORT bool Move(const FilePath& from_path, const FilePath& to_path);
+BASE_EXPORT bool Move(const base::FilePath& from_path,
+                      const base::FilePath& to_path);
 
 // Renames file |from_path| to |to_path|. Both paths must be on the same
 // volume, or the function will fail. Destination file will be created
 // if it doesn't exist. Prefer this function over Move when dealing with
 // temporary files. On Windows it preserves attributes of the target file.
 // Returns true on success.
-BASE_EXPORT bool ReplaceFile(const FilePath& from_path,
+BASE_EXPORT bool ReplaceFile(const base::FilePath& from_path,
-                             const FilePath& to_path);
+                             const base::FilePath& to_path);
 
 // Copies a single file. Use CopyDirectory to copy directories.
-BASE_EXPORT bool CopyFile(const FilePath& from_path, const FilePath& to_path);
+BASE_EXPORT bool CopyFile(const base::FilePath& from_path,
+                          const base::FilePath& to_path);
 
 // Copies the given path, and optionally all subdirectories and their contents
 // as well.
@@ -139,36 +142,37 @@ BASE_EXPORT bool CopyFile(const FilePath& from_path, const FilePath& to_path);
 // Don't use wildcards on the names, it may stop working without notice.
 //
 // If you only need to copy a file use CopyFile, it's faster.
-BASE_EXPORT bool CopyDirectory(const FilePath& from_path,
+BASE_EXPORT bool CopyDirectory(const base::FilePath& from_path,
-                               const FilePath& to_path,
+                               const base::FilePath& to_path,
                                bool recursive);
 
 // Returns true if the given path exists on the local filesystem,
 // false otherwise.
-BASE_EXPORT bool PathExists(const FilePath& path);
+BASE_EXPORT bool PathExists(const base::FilePath& path);
 
 // Returns true if the given path is writable by the user, false otherwise.
-BASE_EXPORT bool PathIsWritable(const FilePath& path);
+BASE_EXPORT bool PathIsWritable(const base::FilePath& path);
 
 // Returns true if the given path exists and is a directory, false otherwise.
-BASE_EXPORT bool DirectoryExists(const FilePath& path);
+BASE_EXPORT bool DirectoryExists(const base::FilePath& path);
 
 // Returns true if the contents of the two files given are equal, false
 // otherwise.  If either file can't be read, returns false.
-BASE_EXPORT bool ContentsEqual(const FilePath& filename1,
+BASE_EXPORT bool ContentsEqual(const base::FilePath& filename1,
-                               const FilePath& filename2);
+                               const base::FilePath& filename2);
 
 // Returns true if the contents of the two text files given are equal, false
 // otherwise.  This routine treats "\r\n" and "\n" as equivalent.
-BASE_EXPORT bool TextContentsEqual(const FilePath& filename1,
+BASE_EXPORT bool TextContentsEqual(const base::FilePath& filename1,
-                                   const FilePath& filename2);
+                                   const base::FilePath& filename2);
 
 // Read the file at |path| into |contents|, returning true on success.
 // This function fails if the |path| contains path traversal components ('..').
 // |contents| may be NULL, in which case this function is useful for its
 // side effect of priming the disk cache.
 // Useful for unit tests.
-BASE_EXPORT bool ReadFileToString(const FilePath& path, std::string* contents);
+BASE_EXPORT bool ReadFileToString(const base::FilePath& path,
+                                  std::string* contents);
 
 #if defined(OS_POSIX)
 // Read exactly |bytes| bytes from file descriptor |fd|, storing the result
@@ -178,12 +182,13 @@ BASE_EXPORT bool ReadFromFD(int fd, char* buffer, size_t bytes);
 
 // Creates a symbolic link at |symlink| pointing to |target|.  Returns
 // false on failure.
-BASE_EXPORT bool CreateSymbolicLink(const FilePath& target,
+BASE_EXPORT bool CreateSymbolicLink(const base::FilePath& target,
-                                    const FilePath& symlink);
+                                    const base::FilePath& symlink);
 
 // Reads the given |symlink| and returns where it points to in |target|.
 // Returns false upon failure.
-BASE_EXPORT bool ReadSymbolicLink(const FilePath& symlink, FilePath* target);
+BASE_EXPORT bool ReadSymbolicLink(const base::FilePath& symlink,
+                                  base::FilePath* target);
 
 // Bits ans masks of the file permission.
 enum FilePermissionBits {
@@ -206,11 +211,11 @@ enum FilePermissionBits {
 // Reads the permission of the given |path|, storing the file permission
 // bits in |mode|. If |path| is symbolic link, |mode| is the permission of
 // a file which the symlink points to.
-BASE_EXPORT bool GetPosixFilePermissions(const FilePath& path,
+BASE_EXPORT bool GetPosixFilePermissions(const base::FilePath& path,
                                          int* mode);
 // Sets the permission of the given |path|. If |path| is symbolic link, sets
 // the permission of a file which the symlink points to.
-BASE_EXPORT bool SetPosixFilePermissions(const FilePath& path,
+BASE_EXPORT bool SetPosixFilePermissions(const base::FilePath& path,
                                          int mode);
 #endif  // defined(OS_POSIX)
 
@@ -219,74 +224,76 @@ BASE_EXPORT bool SetPosixFilePermissions(const FilePath& path,
 // Returns true if all operations succeed.
 // This function simulates Move(), but unlike Move() it works across volumes.
 // This fuction is not transactional.
-BASE_EXPORT bool CopyAndDeleteDirectory(const FilePath& from_path,
+BASE_EXPORT bool CopyAndDeleteDirectory(const base::FilePath& from_path,
-                                        const FilePath& to_path);
+                                        const base::FilePath& to_path);
 #endif  // defined(OS_WIN)
 
 // Return true if the given directory is empty
-BASE_EXPORT bool IsDirectoryEmpty(const FilePath& dir_path);
+BASE_EXPORT bool IsDirectoryEmpty(const base::FilePath& dir_path);
 
 // Get the temporary directory provided by the system.
 // WARNING: DON'T USE THIS. If you want to create a temporary file, use one of
 // the functions below.
-BASE_EXPORT bool GetTempDir(FilePath* path);
+BASE_EXPORT bool GetTempDir(base::FilePath* path);
 // Get a temporary directory for shared memory files.
 // Only useful on POSIX; redirects to GetTempDir() on Windows.
-BASE_EXPORT bool GetShmemTempDir(FilePath* path, bool executable);
+BASE_EXPORT bool GetShmemTempDir(base::FilePath* path, bool executable);
 
 // Get the home directory.  This is more complicated than just getenv("HOME")
 // as it knows to fall back on getpwent() etc.
-BASE_EXPORT FilePath GetHomeDir();
+BASE_EXPORT base::FilePath GetHomeDir();
 
 // Creates a temporary file. The full path is placed in |path|, and the
 // function returns true if was successful in creating the file. The file will
 // be empty and all handles closed after this function returns.
-BASE_EXPORT bool CreateTemporaryFile(FilePath* path);
+BASE_EXPORT bool CreateTemporaryFile(base::FilePath* path);
 
 // Same as CreateTemporaryFile but the file is created in |dir|.
-BASE_EXPORT bool CreateTemporaryFileInDir(const FilePath& dir,
+BASE_EXPORT bool CreateTemporaryFileInDir(const base::FilePath& dir,
-                                          FilePath* temp_file);
+                                          base::FilePath* temp_file);
 
 // Create and open a temporary file.  File is opened for read/write.
 // The full path is placed in |path|.
 // Returns a handle to the opened file or NULL if an error occured.
-BASE_EXPORT FILE* CreateAndOpenTemporaryFile(FilePath* path);
+BASE_EXPORT FILE* CreateAndOpenTemporaryFile(base::FilePath* path);
 // Like above but for shmem files.  Only useful for POSIX.
 // The executable flag says the file needs to support using
 // mprotect with PROT_EXEC after mapping.
-BASE_EXPORT FILE* CreateAndOpenTemporaryShmemFile(FilePath* path,
+BASE_EXPORT FILE* CreateAndOpenTemporaryShmemFile(base::FilePath* path,
                                                   bool executable);
 // Similar to CreateAndOpenTemporaryFile, but the file is created in |dir|.
-BASE_EXPORT FILE* CreateAndOpenTemporaryFileInDir(const FilePath& dir,
+BASE_EXPORT FILE* CreateAndOpenTemporaryFileInDir(const base::FilePath& dir,
-                                                  FilePath* path);
+                                                  base::FilePath* path);
 
 // Create a new directory. If prefix is provided, the new directory name is in
 // the format of prefixyyyy.
 // NOTE: prefix is ignored in the POSIX implementation.
 // If success, return true and output the full path of the directory created.
-BASE_EXPORT bool CreateNewTempDirectory(const FilePath::StringType& prefix,
+BASE_EXPORT bool CreateNewTempDirectory(
-                                        FilePath* new_temp_path);
+    const base::FilePath::StringType& prefix,
+    base::FilePath* new_temp_path);
 
 // Create a directory within another directory.
 // Extra characters will be appended to |prefix| to ensure that the
 // new directory does not have the same name as an existing directory.
-BASE_EXPORT bool CreateTemporaryDirInDir(const FilePath& base_dir,
+BASE_EXPORT bool CreateTemporaryDirInDir(
-                                         const FilePath::StringType& prefix,
+    const base::FilePath& base_dir,
-                                         FilePath* new_dir);
+    const base::FilePath::StringType& prefix,
+    base::FilePath* new_dir);
 
 // Creates a directory, as well as creating any parent directories, if they
 // don't exist. Returns 'true' on successful creation, or if the directory
 // already exists.  The directory is only readable by the current user.
-BASE_EXPORT bool CreateDirectory(const FilePath& full_path);
+BASE_EXPORT bool CreateDirectory(const base::FilePath& full_path);
 
 // Returns the file size. Returns true on success.
-BASE_EXPORT bool GetFileSize(const FilePath& file_path, int64* file_size);
+BASE_EXPORT bool GetFileSize(const base::FilePath& file_path, int64* file_size);
 
 // Returns true if the given path's base name is ".".
-BASE_EXPORT bool IsDot(const FilePath& path);
+BASE_EXPORT bool IsDot(const base::FilePath& path);
 
 // Returns true if the given path's base name is "..".
-BASE_EXPORT bool IsDotDot(const FilePath& path);
+BASE_EXPORT bool IsDotDot(const base::FilePath& path);
 
 // Sets |real_path| to |path| with symbolic links and junctions expanded.
 // On windows, make sure the path starts with a lettered drive.
@@ -294,47 +301,48 @@ BASE_EXPORT bool IsDotDot(const FilePath& path);
 // a directory or to a nonexistent path.  On windows, this function will
 // fail if |path| is a junction or symlink that points to an empty file,
 // or if |real_path| would be longer than MAX_PATH characters.
-BASE_EXPORT bool NormalizeFilePath(const FilePath& path, FilePath* real_path);
+BASE_EXPORT bool NormalizeFilePath(const base::FilePath& path,
+                                   base::FilePath* real_path);
 
 #if defined(OS_WIN)
 
 // Given a path in NT native form ("\Device\HarddiskVolumeXX\..."),
 // return in |drive_letter_path| the equivalent path that starts with
 // a drive letter ("C:\...").  Return false if no such path exists.
-BASE_EXPORT bool DevicePathToDriveLetterPath(const FilePath& device_path,
+BASE_EXPORT bool DevicePathToDriveLetterPath(const base::FilePath& device_path,
-                                             FilePath* drive_letter_path);
+                                             base::FilePath* drive_letter_path);
 
 // Given an existing file in |path|, set |real_path| to the path
 // in native NT format, of the form "\Device\HarddiskVolumeXX\..".
 // Returns false if the path can not be found. Empty files cannot
 // be resolved with this function.
-BASE_EXPORT bool NormalizeToNativeFilePath(const FilePath& path,
+BASE_EXPORT bool NormalizeToNativeFilePath(const base::FilePath& path,
-                                           FilePath* nt_path);
+                                           base::FilePath* nt_path);
 #endif
 
 // This function will return if the given file is a symlink or not.
-BASE_EXPORT bool IsLink(const FilePath& file_path);
+BASE_EXPORT bool IsLink(const base::FilePath& file_path);
 
 // Returns information about the given file path.
-BASE_EXPORT bool GetFileInfo(const FilePath& file_path,
+BASE_EXPORT bool GetFileInfo(const base::FilePath& file_path,
                              base::PlatformFileInfo* info);
 
 // Sets the time of the last access and the time of the last modification.
-BASE_EXPORT bool TouchFile(const FilePath& path,
+BASE_EXPORT bool TouchFile(const base::FilePath& path,
                            const base::Time& last_accessed,
                            const base::Time& last_modified);
 
 // Set the time of the last modification. Useful for unit tests.
-BASE_EXPORT bool SetLastModifiedTime(const FilePath& path,
+BASE_EXPORT bool SetLastModifiedTime(const base::FilePath& path,
                                      const base::Time& last_modified);
 
 #if defined(OS_POSIX)
 // Store inode number of |path| in |inode|. Return true on success.
-BASE_EXPORT bool GetInode(const FilePath& path, ino_t* inode);
+BASE_EXPORT bool GetInode(const base::FilePath& path, ino_t* inode);
 #endif
 
 // Wrapper for fopen-like calls. Returns non-NULL FILE* on success.
-BASE_EXPORT FILE* OpenFile(const FilePath& filename, const char* mode);
+BASE_EXPORT FILE* OpenFile(const base::FilePath& filename, const char* mode);
 
 // Closes file opened by OpenFile. Returns true on success.
 BASE_EXPORT bool CloseFile(FILE* file);
@@ -345,32 +353,33 @@ BASE_EXPORT bool TruncateFile(FILE* file);
 
 // Reads the given number of bytes from the file into the buffer.  Returns
 // the number of read bytes, or -1 on error.
-BASE_EXPORT int ReadFile(const FilePath& filename, char* data, int size);
+BASE_EXPORT int ReadFile(const base::FilePath& filename, char* data, int size);
 
 // Writes the given buffer into the file, overwriting any data that was
 // previously there.  Returns the number of bytes written, or -1 on error.
-BASE_EXPORT int WriteFile(const FilePath& filename, const char* data, int size);
+BASE_EXPORT int WriteFile(const base::FilePath& filename, const char* data,
+                          int size);
 #if defined(OS_POSIX)
 // Append the data to |fd|. Does not close |fd| when done.
 BASE_EXPORT int WriteFileDescriptor(const int fd, const char* data, int size);
 #endif
 // Append the given buffer into the file. Returns the number of bytes written,
 // or -1 on error.
-BASE_EXPORT int AppendToFile(const FilePath& filename,
+BASE_EXPORT int AppendToFile(const base::FilePath& filename,
                              const char* data, int size);
 
 // Gets the current working directory for the process.
-BASE_EXPORT bool GetCurrentDirectory(FilePath* path);
+BASE_EXPORT bool GetCurrentDirectory(base::FilePath* path);
 
 // Sets the current working directory for the process.
-BASE_EXPORT bool SetCurrentDirectory(const FilePath& path);
+BASE_EXPORT bool SetCurrentDirectory(const base::FilePath& path);
 
 // Attempts to find a number that can be appended to the |path| to make it
 // unique. If |path| does not exist, 0 is returned.  If it fails to find such
 // a number, -1 is returned. If |suffix| is not empty, also checks the
 // existence of it with the given suffix.
-BASE_EXPORT int GetUniquePathNumber(const FilePath& path,
+BASE_EXPORT int GetUniquePathNumber(const base::FilePath& path,
-                                    const FilePath::StringType& suffix);
+                                    const base::FilePath::StringType& suffix);
 
 #if defined(OS_POSIX)
 // Test that |path| can only be changed by a given user and members of
@@ -384,8 +393,8 @@ BASE_EXPORT int GetUniquePathNumber(const FilePath& path,
 // * Are not symbolic links.
 // This is useful for checking that a config file is administrator-controlled.
 // |base| must contain |path|.
-BASE_EXPORT bool VerifyPathControlledByUser(const FilePath& base,
+BASE_EXPORT bool VerifyPathControlledByUser(const base::FilePath& base,
-                                            const FilePath& path,
+                                            const base::FilePath& path,
                                             uid_t owner_uid,
                                             const std::set<gid_t>& group_gids);
 #endif  // defined(OS_POSIX)
@@ -398,7 +407,7 @@ BASE_EXPORT bool VerifyPathControlledByUser(const FilePath& base,
 // the filesystem, are owned by the superuser, controlled by the group
 // "admin", are not writable by all users, and contain no symbolic links.
 // Will return false if |path| does not exist.
-BASE_EXPORT bool VerifyPathControlledByAdmin(const FilePath& path);
+BASE_EXPORT bool VerifyPathControlledByAdmin(const base::FilePath& path);
 #endif  // defined(OS_MACOSX) && !defined(OS_IOS)
 
 // A class to handle auto-closing of FILE*'s.
@@ -473,17 +482,17 @@ class BASE_EXPORT FileEnumerator {
   // NOTE: the pattern only matches the contents of root_path, not files in
   // recursive subdirectories.
   // TODO(erikkay): Fix the pattern matching to work at all levels.
-  FileEnumerator(const FilePath& root_path,
+  FileEnumerator(const base::FilePath& root_path,
                  bool recursive,
                  int file_type);
-  FileEnumerator(const FilePath& root_path,
+  FileEnumerator(const base::FilePath& root_path,
                  bool recursive,
                  int file_type,
-                 const FilePath::StringType& pattern);
+                 const base::FilePath::StringType& pattern);
   ~FileEnumerator();
 
   // Returns an empty string if there are no more results.
-  FilePath Next();
+  base::FilePath Next();
 
   // Write the file info into |info|.
   void GetFindInfo(FindInfo* info);
@@ -491,13 +500,13 @@ class BASE_EXPORT FileEnumerator {
   // Looks inside a FindInfo and determines if it's a directory.
   static bool IsDirectory(const FindInfo& info);
 
-  static FilePath GetFilename(const FindInfo& find_info);
+  static base::FilePath GetFilename(const FindInfo& find_info);
   static int64 GetFilesize(const FindInfo& find_info);
   static base::Time GetLastModifiedTime(const FindInfo& find_info);
 
  private:
   // Returns true if the given path should be skipped in enumeration.
-  bool ShouldSkip(const FilePath& path);
+  bool ShouldSkip(const base::FilePath& path);
 
 
 #if defined(OS_WIN)
@@ -507,13 +516,13 @@ class BASE_EXPORT FileEnumerator {
   HANDLE find_handle_;
 #elif defined(OS_POSIX)
   struct DirectoryEntryInfo {
-    FilePath filename;
+    base::FilePath filename;
     struct stat stat;
   };
 
   // Read the filenames in source into the vector of DirectoryEntryInfo's
   static bool ReadDirectory(std::vector<DirectoryEntryInfo>* entries,
-                            const FilePath& source, bool show_links);
+                            const base::FilePath& source, bool show_links);
 
   // The files in the current directory
   std::vector<DirectoryEntryInfo> directory_entries_;
@@ -522,14 +531,15 @@ class BASE_EXPORT FileEnumerator {
   size_t current_directory_entry_;
 #endif
 
-  FilePath root_path_;
+  base::FilePath root_path_;
   bool recursive_;
   int file_type_;
-  FilePath::StringType pattern_;  // Empty when we want to find everything.
+  base::FilePath::StringType pattern_;  // Empty when we want to find
+                                        // everything.
 
   // A stack that keeps track of which subdirectories we still need to
   // enumerate in the breadth-first search.
-  std::stack<FilePath> pending_paths_;
+  std::stack<base::FilePath> pending_paths_;
 
   DISALLOW_COPY_AND_ASSIGN(FileEnumerator);
 };
@@ -545,7 +555,7 @@ class BASE_EXPORT MemoryMappedFile {
   // then this method will fail and return false. If it cannot open the file,
   // the file does not exist, or the memory mapping fails, it will return false.
   // Later we may want to allow the user to specify access.
-  bool Initialize(const FilePath& file_name);
+  bool Initialize(const base::FilePath& file_name);
   // As above, but works with an already-opened file. MemoryMappedFile will take
   // ownership of |file| and close it when done.
   bool Initialize(base::PlatformFile file);
@@ -553,7 +563,7 @@ class BASE_EXPORT MemoryMappedFile {
 #if defined(OS_WIN)
   // Opens an existing file and maps it as an image section. Please refer to
   // the Initialize function above for additional information.
-  bool InitializeAsImageSection(const FilePath& file_name);
+  bool InitializeAsImageSection(const base::FilePath& file_name);
 #endif  // OS_WIN
 
   const uint8* data() const { return data_; }
@@ -564,7 +574,7 @@ class BASE_EXPORT MemoryMappedFile {
 
  private:
   // Open the given file and pass it to MapFileToMemoryInternal().
-  bool MapFileToMemory(const FilePath& file_name);
+  bool MapFileToMemory(const base::FilePath& file_name);
 
   // Map the file to memory, set data_ to that memory address. Return true on
   // success, false on any kind of failure. This is a helper for Initialize().
@@ -609,7 +619,8 @@ enum FileSystemType {
 
 // Attempts determine the FileSystemType for |path|.
 // Returns false if |path| doesn't exist.
-BASE_EXPORT bool GetFileSystemType(const FilePath& path, FileSystemType* type);
+BASE_EXPORT bool GetFileSystemType(const base::FilePath& path,
+                                   FileSystemType* type);
 #endif
 
 }  // namespace file_util

base/file_version_info.h

@@ -18,7 +18,9 @@ extern "C" IMAGE_DOS_HEADER __ImageBase;
 #include "base/base_export.h"
 #include "base/string16.h"
 
+namespace base {
 class FilePath;
+}
 
 // Provides an interface for accessing the version information for a file. This
 // is the information you access when you select a file in the Windows Explorer,
@@ -38,7 +40,7 @@ class FileVersionInfo {
   // goes wrong (typically the file does not exit or cannot be opened). The
   // returned object should be deleted when you are done with it.
   BASE_EXPORT static FileVersionInfo* CreateFileVersionInfo(
-      const FilePath& file_path);
+      const base::FilePath& file_path);
 #endif  // OS_WIN || OS_MACOSX
 
 #if defined(OS_WIN)

base/i18n/file_util_icu.h

@@ -25,18 +25,18 @@ BASE_I18N_EXPORT bool IsFilenameLegal(const string16& file_name);
 //   file_name == "bad:file*name?.txt", changed to: "bad-file-name-.txt" when
 //   'replace_char' is '-'.
 BASE_I18N_EXPORT void ReplaceIllegalCharactersInPath(
-    FilePath::StringType* file_name,
+    base::FilePath::StringType* file_name,
     char replace_char);
 
 // Compares two filenames using the current locale information. This can be
 // used to sort directory listings. It behaves like "operator<" for use in
 // std::sort.
-BASE_I18N_EXPORT bool LocaleAwareCompareFilenames(const FilePath& a,
+BASE_I18N_EXPORT bool LocaleAwareCompareFilenames(const base::FilePath& a,
-                                                  const FilePath& b);
+                                                  const base::FilePath& b);
 
 // Calculates the canonical file-system representation of |file_name| base name.
 // Modifies |file_name| in place. No-op if not on ChromeOS.
-BASE_I18N_EXPORT void NormalizeFileNameEncoding(FilePath* file_name);
+BASE_I18N_EXPORT void NormalizeFileNameEncoding(base::FilePath* file_name);
 
 }  // namespace file_util
 

base/i18n/rtl.h

@@ -12,9 +12,10 @@
 #include "base/string16.h"
 #include "build/build_config.h"
 
+namespace base {
+
 class FilePath;
 
-namespace base {
 namespace i18n {
 
 const char16 kRightToLeftMark = 0x200F;

base/mac/bundle_locations.h

@@ -15,9 +15,10 @@ class NSBundle;
 class NSString;
 #endif  // __OBJC__
 
+namespace base {
+
 class FilePath;
 
-namespace base {
 namespace mac {
 
 // This file provides several functions to explicitly request the various

base/mac/foundation_util.h

@@ -28,8 +28,6 @@ class NSString;
 #include <ApplicationServices/ApplicationServices.h>
 #endif
 
-class FilePath;
-
 // Adapted from NSPathUtilities.h and NSObjCRuntime.h.
 #if __LP64__ || NS_BUILD_32_LIKE_64
 typedef unsigned long NSSearchPathDirectory;
@@ -43,6 +41,9 @@ typedef struct OpaqueSecTrustRef* SecACLRef;
 typedef struct OpaqueSecTrustedApplicationRef* SecTrustedApplicationRef;
 
 namespace base {
+
+class FilePath;
+
 namespace mac {
 
 // Returns true if the application is running from a bundle

base/mac/mac_util.h

@@ -21,9 +21,10 @@
 class NSImage;
 #endif  // __OBJC__
 
+namespace base {
+
 class FilePath;
 
-namespace base {
 namespace mac {
 
 // Full screen modes, in increasing order of priority.  More permissive modes

base/native_library.h

@@ -26,10 +26,10 @@
 #define CDECL
 #endif
 
-class FilePath;
-
 namespace base {
 
+class FilePath;
+
 #if defined(OS_WIN)
 typedef HMODULE NativeLibrary;
 #elif defined(OS_MACOSX)

base/nix/mime_util_xdg.h

@@ -10,9 +10,10 @@
 #include "base/base_export.h"
 #include "build/build_config.h"
 
+namespace base {
+
 class FilePath;
 
-namespace base {
 namespace nix {
 
 // Gets the mime type for a file based on its filename. The file path does not

base/nix/xdg_util.h

@@ -18,11 +18,10 @@
 #error asdf
 #endif
 
-class FilePath;
-
 namespace base {
 
 class Environment;
+class FilePath;
 
 namespace nix {
 

base/path_service.h

@@ -12,9 +12,8 @@
 #include "base/gtest_prod_util.h"
 #include "build/build_config.h"
 
-class FilePath;
-
 namespace base {
+class FilePath;
 class ScopedPathOverride;
 }  // namespace
 
@@ -30,7 +29,7 @@ class BASE_EXPORT PathService {
   //
   // Returns true if the directory or file was successfully retrieved. On
   // failure, 'path' will not be changed.
-  static bool Get(int key, FilePath* path);
+  static bool Get(int key, base::FilePath* path);
 
   // Overrides the path to a special directory or file.  This cannot be used to
   // change the value of DIR_CURRENT, but that should be obvious.  Also, if the
@@ -42,13 +41,13 @@ class BASE_EXPORT PathService {
   //
   // WARNING: Consumers of PathService::Get may expect paths to be constant
   // over the lifetime of the app, so this method should be used with caution.
-  static bool Override(int key, const FilePath& path);
+  static bool Override(int key, const base::FilePath& path);
 
   // This function does the same as PathService::Override but it takes an extra
   // parameter |create| which guides whether the directory to be overriden must
   // be created in case it doesn't exist already.
   static bool OverrideAndCreateIfNeeded(int key,
-                                        const FilePath& path,
+                                        const base::FilePath& path,
                                         bool create);
 
   // To extend the set of supported keys, you can register a path provider,
@@ -59,7 +58,7 @@ class BASE_EXPORT PathService {
   // WARNING: This function could be called on any thread from which the
   // PathService is used, so a the ProviderFunc MUST BE THREADSAFE.
   //
-  typedef bool (*ProviderFunc)(int, FilePath*);
+  typedef bool (*ProviderFunc)(int, base::FilePath*);
 
   // Call to register a path provider.  You must specify the range "[key_start,
   // key_end)" of supported path keys.

base/perftimer.h

@@ -10,14 +10,16 @@
 #include "base/basictypes.h"
 #include "base/time.h"
 
+namespace base {
 class FilePath;
+}
 
 // ----------------------------------------------------------------------
 // Initializes and finalizes the perf log. These functions should be
 // called at the beginning and end (respectively) of running all the
 // performance tests. The init function returns true on success.
 // ----------------------------------------------------------------------
-bool InitPerfLog(const FilePath& log_path);
+bool InitPerfLog(const base::FilePath& log_path);
 void FinalizePerfLog();
 
 // ----------------------------------------------------------------------

base/prefs/json_pref_store.h

@@ -20,12 +20,12 @@
 
 namespace base {
 class DictionaryValue;
+class FilePath;
 class SequencedWorkerPool;
 class SequencedTaskRunner;
 class Value;
 }
 
-class FilePath;
 
 // A writable PrefStore implementation that is used for user preferences.
 class BASE_PREFS_EXPORT JsonPrefStore
@@ -35,12 +35,12 @@ class BASE_PREFS_EXPORT JsonPrefStore
   // Returns instance of SequencedTaskRunner which guarantees that file
   // operations on the same file will be executed in sequenced order.
   static scoped_refptr<base::SequencedTaskRunner> GetTaskRunnerForFile(
-      const FilePath& pref_filename,
+      const base::FilePath& pref_filename,
       base::SequencedWorkerPool* worker_pool);
 
   // |sequenced_task_runner| is must be a shutdown-blocking task runner, ideally
   // created by GetTaskRunnerForFile() method above.
-  JsonPrefStore(const FilePath& pref_filename,
+  JsonPrefStore(const base::FilePath& pref_filename,
                 base::SequencedTaskRunner* sequenced_task_runner);
 
   // PrefStore overrides:
@@ -78,7 +78,7 @@ class BASE_PREFS_EXPORT JsonPrefStore
   // ImportantFileWriter::DataSerializer overrides:
   virtual bool SerializeData(std::string* output) OVERRIDE;
 
-  FilePath path_;
+  base::FilePath path_;
   const scoped_refptr<base::SequencedTaskRunner> sequenced_task_runner_;
 
   scoped_ptr<base::DictionaryValue> prefs_;

base/prefs/public/pref_service_base.h

@@ -18,6 +18,10 @@
 
 #include "base/values.h"
 
+namespace base {
+class FilePath;
+}
+
 namespace content {
 class BrowserContext;
 }
@@ -26,7 +30,6 @@ namespace subtle {
 class PrefMemberBase;
 }
 
-class FilePath;
 class PrefObserver;
 
 class PrefServiceBase {
@@ -118,7 +121,7 @@ class PrefServiceBase {
   virtual int GetInteger(const char* path) const = 0;
   virtual double GetDouble(const char* path) const = 0;
   virtual std::string GetString(const char* path) const = 0;
-  virtual FilePath GetFilePath(const char* path) const = 0;
+  virtual base::FilePath GetFilePath(const char* path) const = 0;
 
   // Returns the branch if it exists, or the registered default value otherwise.
   // Note that |path| must point to a registered preference. In that case, these
@@ -140,7 +143,7 @@ class PrefServiceBase {
   virtual void SetInteger(const char* path, int value) = 0;
   virtual void SetDouble(const char* path, double value) = 0;
   virtual void SetString(const char* path, const std::string& value) = 0;
-  virtual void SetFilePath(const char* path, const FilePath& value) = 0;
+  virtual void SetFilePath(const char* path, const base::FilePath& value) = 0;
 
   // Int64 helper methods that actually store the given value as a string.
   // Note that if obtaining the named value via GetDictionary or GetList, the

base/scoped_native_library.h

@@ -8,10 +8,10 @@
 #include "base/base_export.h"
 #include "base/native_library.h"
 
-class FilePath;
-
 namespace base {
 
+class FilePath;
+
 // A class which encapsulates a base::NativeLibrary object available only in a
 // scope.
 // This class automatically unloads the loaded library in its destructor.

base/shared_memory.h

@@ -23,10 +23,10 @@
 #include "base/file_descriptor_posix.h"
 #endif
 
-class FilePath;
-
 namespace base {
 
+class FilePath;
+
 // SharedMemoryHandle is a platform specific type which represents
 // the underlying OS handle to a shared memory segment.
 #if defined(OS_WIN)

base/test/scoped_path_override.h

@@ -8,10 +8,10 @@
 #include "base/basictypes.h"
 #include "base/files/scoped_temp_dir.h"
 
-class FilePath;
-
 namespace base {
 
+class FilePath;
+
 // Sets a path override on construction, and removes it when the object goes out
 // of scope. This class is intended to be used by tests that need to override
 // paths to ensure their overrides are properly handled and reverted when the

base/test/test_file_util.h

@@ -12,18 +12,20 @@
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 
+namespace base {
 class FilePath;
+}
 
 namespace file_util {
 
 // Wrapper over file_util::Delete. On Windows repeatedly invokes Delete in case
 // of failure to workaround Windows file locking semantics. Returns true on
 // success.
-bool DieFileDie(const FilePath& file, bool recurse);
+bool DieFileDie(const base::FilePath& file, bool recurse);
 
 // Clear a specific file from the system cache. After this call, trying
 // to access this file will result in a cold load from the hard drive.
-bool EvictFileFromSystemCache(const FilePath& file);
+bool EvictFileFromSystemCache(const base::FilePath& file);
 
 // Like CopyFileNoCache but recursively copies all files and subdirectories
 // in the given input directory to the output directory. Any files in the
@@ -31,39 +33,39 @@ bool EvictFileFromSystemCache(const FilePath& file);
 //
 // Returns true on success. False means there was some error copying, so the
 // state of the destination is unknown.
-bool CopyRecursiveDirNoCache(const FilePath& source_dir,
+bool CopyRecursiveDirNoCache(const base::FilePath& source_dir,
-                             const FilePath& dest_dir);
+                             const base::FilePath& dest_dir);
 
 #if defined(OS_WIN)
 // Returns true if the volume supports Alternate Data Streams.
-bool VolumeSupportsADS(const FilePath& path);
+bool VolumeSupportsADS(const base::FilePath& path);
 
 // Returns true if the ZoneIdentifier is correctly set to "Internet" (3).
 // Note that this function must be called from the same process as
 // the one that set the zone identifier.  I.e. don't use it in UI/automation
 // based tests.
-bool HasInternetZoneIdentifier(const FilePath& full_path);
+bool HasInternetZoneIdentifier(const base::FilePath& full_path);
 #endif  // defined(OS_WIN)
 
 // In general it's not reliable to convert a FilePath to a wstring and we use
 // string16 elsewhere for Unicode strings, but in tests it is frequently
 // convenient to be able to compare paths to literals like L"foobar".
-std::wstring FilePathAsWString(const FilePath& path);
+std::wstring FilePathAsWString(const base::FilePath& path);
-FilePath WStringAsFilePath(const std::wstring& path);
+base::FilePath WStringAsFilePath(const std::wstring& path);
 
 // For testing, make the file unreadable or unwritable.
 // In POSIX, this does not apply to the root user.
-bool MakeFileUnreadable(const FilePath& path) WARN_UNUSED_RESULT;
+bool MakeFileUnreadable(const base::FilePath& path) WARN_UNUSED_RESULT;
-bool MakeFileUnwritable(const FilePath& path) WARN_UNUSED_RESULT;
+bool MakeFileUnwritable(const base::FilePath& path) WARN_UNUSED_RESULT;
 
 // Saves the current permissions for a path, and restores it on destruction.
 class PermissionRestorer {
  public:
-  explicit PermissionRestorer(const FilePath& path);
+  explicit PermissionRestorer(const base::FilePath& path);
   ~PermissionRestorer();
 
  private:
-  const FilePath path_;
+  const base::FilePath path_;
   void* info_;  // The opaque stored permission information.
   size_t length_;  // The length of the stored permission information.
 

base/value_conversions.h

@@ -9,10 +9,10 @@
 
 #include "base/base_export.h"
 
-class FilePath;
 
 namespace base {
 
+class FilePath;
 class TimeDelta;
 class StringValue;
 class Value;

chrome/app/chrome_main_mac.h

@@ -5,11 +5,13 @@
 #ifndef CHROME_APP_CHROME_MAIN_MAC_H_
 #define CHROME_APP_CHROME_MAIN_MAC_H_
 
+namespace base {
 class FilePath;
+}
 
 // Checks if the UserDataDir policy has been set and returns its value in the
 // |user_data_dir| parameter. If no policy is set the parameter is not changed.
-void CheckUserDataDirPolicy(FilePath* user_data_dir);
+void CheckUserDataDirPolicy(base::FilePath* user_data_dir);
 
 // Sets the app bundle (base::mac::FrameworkBundle()) to the framework's bundle,
 // and sets the base bundle ID (base::mac::BaseBundleID()) to the proper value

chrome/browser/automation/automation_provider.h

@@ -44,7 +44,6 @@ class AutomationTabTracker;
 class AutomationWindowTracker;
 class Browser;
 class ExternalTabContainer;
-class FilePath;
 class FindInPageNotificationObserver;
 class InitialLoadObserver;
 class LoginHandler;

chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h

@@ -11,7 +11,9 @@
 @class NSString;
 #endif  // __OBJC__
 
+namespace base {
 class FilePath;
+}
 
 // This set of functions lets C++ code interact with the cocoa pasteboard
 // and dragging methods.
@@ -25,12 +27,12 @@ enum PasteboardType {
 // Writes a set of bookmark elements from a profile to the specified pasteboard.
 void WriteToPasteboard(PasteboardType type,
                        const std::vector<BookmarkNodeData::Element>& elements,
-                       const FilePath& profile_path);
+                       const base::FilePath& profile_path);
 
 // Reads a set of bookmark elements from the specified pasteboard.
 bool ReadFromPasteboard(PasteboardType type,
                         std::vector<BookmarkNodeData::Element>& elements,
-                        FilePath* profile_path);
+                        base::FilePath* profile_path);
 
 // Returns true if the specified pasteboard contains any sort of
 // bookmark elements.  It currently does not consider a plaintext url a

chrome/browser/chromeos/customization_document.h

@@ -16,11 +16,11 @@
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
-class FilePath;
 class PrefServiceSimple;
 
 namespace base {
 class DictionaryValue;
+class FilePath;
 }
 
 namespace net {
@@ -44,7 +44,7 @@ class CustomizationDocument {
  protected:
   explicit CustomizationDocument(const std::string& accepted_version);
 
-  virtual bool LoadManifestFromFile(const FilePath& manifest_path);
+  virtual bool LoadManifestFromFile(const base::FilePath& manifest_path);
   virtual bool LoadManifestFromString(const std::string& manifest);
 
   std::string GetLocaleSpecificString(const std::string& locale,
@@ -158,7 +158,7 @@ class ServicesCustomizationDocument : public CustomizationDocument,
   void StartFileFetch();
 
   // Executes on FILE thread and reads file to string.
-  void ReadFileInBackground(const FilePath& file);
+  void ReadFileInBackground(const base::FilePath& file);
 
   // Services customization manifest URL.
   GURL url_;

chrome/browser/chromeos/drive/drive_feed_loader_observer.h

@@ -7,7 +7,9 @@
 
 #include <string>
 
+namespace base {
 class FilePath;
+}
 
 namespace drive {
 
@@ -18,7 +20,7 @@ class DriveFeedLoaderObserver {
   // Triggered when a content of a directory has been changed.
   // |directory_path| is a virtual directory path representing the
   // changed directory.
-  virtual void OnDirectoryChanged(const FilePath& directory_path) {
+  virtual void OnDirectoryChanged(const base::FilePath& directory_path) {
   }
 
   // Triggered when a resource list is fetched. |num_accumulated_entries|

chrome/browser/chromeos/drive/drive_file_system_observer.h

@@ -7,7 +7,9 @@
 
 #include "chrome/browser/chromeos/drive/drive_file_error.h"
 
+namespace base {
 class FilePath;
+}
 
 namespace drive {
 
@@ -19,7 +21,7 @@ class DriveFileSystemObserver {
   // Triggered when a content of a directory has been changed.
   // |directory_path| is a virtual directory path (/drive/...) representing
   // changed directory.
-  virtual void OnDirectoryChanged(const FilePath& directory_path) {
+  virtual void OnDirectoryChanged(const base::FilePath& directory_path) {
   }
 
   // Triggered when the file system is initially loaded.

chrome/browser/chromeos/drive/drive_file_system_util.h

@@ -16,9 +16,12 @@
 #include "chrome/browser/google_apis/gdata_errorcode.h"
 #include "googleurl/src/gurl.h"
 
-class FilePath;
 class Profile;
 
+namespace base {
+class FilePath;
+}
+
 namespace drive {
 
 class PlatformFileInfoProto;
@@ -39,13 +42,13 @@ const char kWildCard[] = "*";
 const char kSymLinkToDevNull[] = "/dev/null";
 
 // Returns the Drive mount point path, which looks like "/special/drive".
-const FilePath& GetDriveMountPointPath();
+const base::FilePath& GetDriveMountPointPath();
 
 // Returns the Drive mount path as string.
 const std::string& GetDriveMountPointPathAsString();
 
 // Returns the 'local' root of remote file system as "/special".
-const FilePath& GetSpecialRemoteRootPath();
+const base::FilePath& GetSpecialRemoteRootPath();
 
 // Returns the gdata file resource url formatted as
 // chrome://drive/<resource_id>/<file_name>.
@@ -54,16 +57,16 @@ GURL GetFileResourceUrl(const std::string& resource_id,
 
 // Given a profile and a drive_cache_path, return the file resource url.
 void ModifyDriveFileResourceUrl(Profile* profile,
-                                const FilePath& drive_cache_path,
+                                const base::FilePath& drive_cache_path,
                                 GURL* url);
 
 // Returns true if the given path is under the Drive mount point.
-bool IsUnderDriveMountPoint(const FilePath& path);
+bool IsUnderDriveMountPoint(const base::FilePath& path);
 
 // Extracts the Drive path from the given path located under the Drive mount
 // point. Returns an empty path if |path| is not under the Drive mount point.
 // Examples: ExtractGDatPath("/special/drive/foo.txt") => "drive/foo.txt"
-FilePath ExtractDrivePath(const FilePath& path);
+base::FilePath ExtractDrivePath(const base::FilePath& path);
 
 // Escapes a file name in Drive cache.
 // Replaces percent ('%'), period ('.') and slash ('/') with %XX (hex)
@@ -90,13 +93,13 @@ std::string ExtractResourceIdFromUrl(const GURL& url);
 // Case 3: Mounted files have all three parts.
 // Example: path="/user/GCache/v1/persistent/pdf:a1b2.01234567.mounted" =>
 //          resource_id="pdf:a1b2", md5="01234567", extra_extension="mounted".
-void ParseCacheFilePath(const FilePath& path,
+void ParseCacheFilePath(const base::FilePath& path,
                         std::string* resource_id,
                         std::string* md5,
                         std::string* extra_extension);
 
-// Callback type for PrepareWritableFilePathAndRun.
+// Callback type for PrepareWritablebase::FilePathAndRun.
-typedef base::Callback<void (DriveFileError, const FilePath& path)>
+typedef base::Callback<void (DriveFileError, const base::FilePath& path)>
     OpenFileCallback;
 
 // Invokes |callback| on blocking thread pool, after converting virtual |path|
@@ -108,7 +111,7 @@ typedef base::Callback<void (DriveFileError, const FilePath& path)>
 //
 // Must be called from UI thread.
 void PrepareWritableFileAndRun(Profile* profile,
-                               const FilePath& path,
+                               const base::FilePath& path,
                                const OpenFileCallback& callback);
 
 // Ensures the existence of |directory| of '/special/drive/foo'.  This will
@@ -122,7 +125,7 @@ void PrepareWritableFileAndRun(Profile* profile,
 //
 // Must be called from UI/IO thread.
 void EnsureDirectoryExists(Profile* profile,
-                           const FilePath& directory,
+                           const base::FilePath& directory,
                            const FileOperationCallback& callback);
 
 // Converts GData error code into file platform error code.

chrome/browser/chromeos/drive/drive_prefetcher.h

@@ -17,7 +17,9 @@
 #include "chrome/browser/chromeos/drive/drive_file_system_observer.h"
 #include "chrome/browser/chromeos/drive/drive_sync_client_observer.h"
 
+namespace base {
 class FilePath;
+}
 
 namespace drive {
 
@@ -45,7 +47,8 @@ class DrivePrefetcher : public DriveFileSystemObserver,
 
   // DriveFileSystemObserver overrides.
   virtual void OnInitialLoadFinished(DriveFileError error) OVERRIDE;
-  virtual void OnDirectoryChanged(const FilePath& directory_path) OVERRIDE;
+  virtual void OnDirectoryChanged(
+      const base::FilePath& directory_path) OVERRIDE;
 
   // DriveSyncClientObserver overrides.
   virtual void OnSyncTaskStarted() OVERRIDE;
@@ -63,7 +66,7 @@ class DrivePrefetcher : public DriveFileSystemObserver,
   // Called when DoPrefetch is done.
   void OnPrefetchFinished(const std::string& resource_id,
                           DriveFileError error,
-                          const FilePath& file_path,
+                          const base::FilePath& file_path,
                           const std::string& mime_type,
                           DriveFileType file_type);
 
@@ -72,8 +75,8 @@ class DrivePrefetcher : public DriveFileSystemObserver,
 
   // Helper methods to traverse over the file system.
   void VisitFile(const DriveEntryProto& entry);
-  void VisitDirectory(const FilePath& directory_path);
+  void VisitDirectory(const base::FilePath& directory_path);
-  void OnReadDirectory(const FilePath& directory_path,
+  void OnReadDirectory(const base::FilePath& directory_path,
                        DriveFileError error,
                        bool hide_hosted_documents,
                        scoped_ptr<DriveEntryProtoVector> entries);

chrome/browser/chromeos/drive/drive_system_service.h

@@ -17,7 +17,9 @@
 #include "chrome/browser/profiles/profile_keyed_service_factory.h"
 #include "sync/notifier/invalidation_handler.h"
 
+namespace base {
 class FilePath;
+}
 
 namespace google_apis {
 class DriveServiceInterface;
@@ -50,7 +52,7 @@ class DriveSystemService : public ProfileKeyedService,
   // Pass NULL or the empty value when not interested.
   DriveSystemService(Profile* profile,
                      google_apis::DriveServiceInterface* test_drive_service,
-                     const FilePath& test_cache_root,
+                     const base::FilePath& test_cache_root,
                      DriveFileSystemInterface* test_file_system);
   virtual ~DriveSystemService();
 

chrome/browser/chromeos/drive/drive_test_util.h

@@ -10,9 +10,8 @@
 #include "chrome/browser/google_apis/gdata_errorcode.h"
 #include "chrome/browser/google_apis/test_util.h"
 
-class FilePath;
-
 namespace base {
+class FilePath;
 class Value;
 }
 
@@ -51,9 +50,9 @@ void CopyErrorCodeFromFileOperationCallback(DriveFileError* output,
 // Copies |error| and |moved_file_path| to |out_error| and |out_file_path|.
 // Used to run asynchronous functions that take FileMoveCallback from tests.
 void CopyResultsFromFileMoveCallback(DriveFileError* out_error,
-                                     FilePath* out_file_path,
+                                     base::FilePath* out_file_path,
                                      DriveFileError error,
-                                     const FilePath& moved_file_path);
+                                     const base::FilePath& moved_file_path);
 
 // Copies |error| and |entry_proto| to |out_error| and |out_entry_proto|
 // respectively. Used to run asynchronous functions that take
@@ -85,14 +84,14 @@ void CopyResultsFromReadDirectoryByPathCallback(
 
 // Copies |error|, |drive_file_path|, and |entry_proto| to |out_error|,
 // |out_drive_file_path|, and |out_entry_proto| respectively. Used to run
-// asynchronous functions that take GetEntryInfoWithFilePathCallback from
+// asynchronous functions that take GetEntryInfoWithbase::FilePathCallback from
 // tests.
 void CopyResultsFromGetEntryInfoWithFilePathCallback(
     DriveFileError* out_error,
-    FilePath* out_drive_file_path,
+    base::FilePath* out_drive_file_path,
     scoped_ptr<DriveEntryProto>* out_entry_proto,
     DriveFileError error,
-    const FilePath& drive_file_path,
+    const base::FilePath& drive_file_path,
     scoped_ptr<DriveEntryProto> entry_proto);
 
 // Copies |result| to |out_result|. Used to run asynchronous functions
@@ -108,10 +107,11 @@ void CopyResultFromInitializeCacheCallback(bool* out_success,
 
 // Copies results from DriveCache methods. Used to run asynchronous functions
 // that take GetFileFromCacheCallback from tests.
-void CopyResultsFromGetFileFromCacheCallback(DriveFileError* out_error,
+void CopyResultsFromGetFileFromCacheCallback(
-                                             FilePath* out_cache_file_path,
+    DriveFileError* out_error,
-                                             DriveFileError error,
+    base::FilePath* out_cache_file_path,
-                                             const FilePath& cache_file_path);
+    DriveFileError error,
+    const base::FilePath& cache_file_path);
 
 // Copies results from DriveCache methods. Used to run asynchronous functions
 // that take GetCacheEntryCallback from tests.
@@ -123,10 +123,10 @@ void CopyResultsFromGetCacheEntryCallback(bool* out_success,
 // Copies results from DriveFileSystem methods. Used to run asynchronous
 // functions that take GetFileCallback from tests.
 void CopyResultsFromGetFileCallback(DriveFileError* out_error,
-                                    FilePath* out_file_path,
+                                    base::FilePath* out_file_path,
                                     DriveFileType* out_file_type,
                                     DriveFileError error,
-                                    const FilePath& file_path,
+                                    const base::FilePath& file_path,
                                     const std::string& mime_type,
                                     DriveFileType file_type);
 
@@ -143,9 +143,9 @@ void CopyResultsFromGetAvailableSpaceCallback(DriveFileError* out_error,
 // of the current thread. Used to run asynchronous function that take
 // OpenFileCallback.
 void CopyResultsFromOpenFileCallbackAndQuit(DriveFileError* out_error,
-                                            FilePath* out_file_path,
+                                            base::FilePath* out_file_path,
                                             DriveFileError error,
-                                            const FilePath& file_path);
+                                            const base::FilePath& file_path);
 
 // Copies the results from DriveFileSystem methods and stops the message loop
 // of the current thread. Used to run asynchronous function that take

chrome/browser/chromeos/drive/drive_webapps_registry.h

@@ -13,7 +13,9 @@
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
 #include "googleurl/src/gurl.h"
 
+namespace base {
 class FilePath;
+}
 
 namespace google_apis {
 class AppList;
@@ -57,7 +59,7 @@ class DriveWebAppsRegistry {
   virtual ~DriveWebAppsRegistry();
 
   // DriveWebAppsRegistry overrides.
-  virtual void GetWebAppsForFile(const FilePath& file,
+  virtual void GetWebAppsForFile(const base::FilePath& file,
                                  const std::string& mime_type,
                                  ScopedVector<DriveWebAppInfo>* apps);
   virtual std::set<std::string> GetExtensionsForWebStoreApp(

chrome/browser/chromeos/drive/file_system/copy_operation.h

@@ -11,10 +11,10 @@
 #include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
 #include "chrome/browser/google_apis/gdata_errorcode.h"
 
-class FilePath;
 class GURL;
 
 namespace base {
+class FilePath;
 class Value;
 }
 
@@ -49,8 +49,8 @@ class CopyOperation {
   // Performs the copy operation on the file at drive path |src_file_path|
   // with a target of |dest_file_path|. Invokes |callback| when finished with
   // the result of the operation. |callback| must not be null.
-  virtual void Copy(const FilePath& src_file_path,
+  virtual void Copy(const base::FilePath& src_file_path,
-                    const FilePath& dest_file_path,
+                    const base::FilePath& dest_file_path,
                     const FileOperationCallback& callback);
 
   // Initiates transfer of |remote_src_file_path| to |local_dest_file_path|.
@@ -60,8 +60,8 @@ class CopyOperation {
   // Must be called from *UI* thread. |callback| is run on the calling thread.
   // |callback| must not be null.
   virtual void TransferFileFromRemoteToLocal(
-      const FilePath& remote_src_file_path,
+      const base::FilePath& remote_src_file_path,
-      const FilePath& local_dest_file_path,
+      const base::FilePath& local_dest_file_path,
       const FileOperationCallback& callback);
 
   // Initiates transfer of |local_src_file_path| to |remote_dest_file_path|.
@@ -72,8 +72,8 @@ class CopyOperation {
   // Must be called from *UI* thread. |callback| is run on the calling thread.
   // |callback| must not be null.
   virtual void TransferFileFromLocalToRemote(
-      const FilePath& local_src_file_path,
+      const base::FilePath& local_src_file_path,
-      const FilePath& remote_dest_file_path,
+      const base::FilePath& remote_dest_file_path,
       const FileOperationCallback& callback);
 
   // Initiates transfer of |local_file_path| to |remote_dest_file_path|.
@@ -83,8 +83,8 @@ class CopyOperation {
   //
   // Must be called from *UI* thread. |callback| is run on the calling thread.
   // |callback| must not be null.
-  virtual void TransferRegularFile(const FilePath& local_file_path,
+  virtual void TransferRegularFile(const base::FilePath& local_file_path,
-                                   const FilePath& remote_dest_file_path,
+                                   const base::FilePath& remote_dest_file_path,
                                    const FileOperationCallback& callback);
 
  private:
@@ -98,27 +98,28 @@ class CopyOperation {
   //
   // Can be called from UI thread. |callback| is run on the calling thread.
   // |callback| must not be null.
-  void OnGetFileCompleteForTransferFile(const FilePath& local_dest_file_path,
+  void OnGetFileCompleteForTransferFile(
-                                        const FileOperationCallback& callback,
+      const base::FilePath& local_dest_file_path,
-                                        DriveFileError error,
+      const FileOperationCallback& callback,
-                                        const FilePath& local_file_path,
+      DriveFileError error,
-                                        const std::string& unused_mime_type,
+      const base::FilePath& local_file_path,
-                                        DriveFileType file_type);
+      const std::string& unused_mime_type,
+      DriveFileType file_type);
 
   // Copies a hosted document with |resource_id| to the directory at |dir_path|
   // and names the copied document as |new_name|.
   //
   // Can be called from UI thread. |callback| is run on the calling thread.
   // |callback| must not be null.
-  void CopyHostedDocumentToDirectory(const FilePath& dir_path,
+  void CopyHostedDocumentToDirectory(const base::FilePath& dir_path,
                                      const std::string& resource_id,
-                                     const FilePath::StringType& new_name,
+                                     const base::FilePath::StringType& new_name,
                                      const FileOperationCallback& callback);
 
   // Callback for handling document copy attempt.
   // |callback| must not be null.
   void OnCopyHostedDocumentCompleted(
-      const FilePath& dir_path,
+      const base::FilePath& dir_path,
       const FileOperationCallback& callback,
       google_apis::GDataErrorCode status,
       scoped_ptr<google_apis::ResourceEntry> resource_entry);
@@ -129,14 +130,14 @@ class CopyOperation {
   //
   // Can be called from UI thread. |callback| is run on the calling thread.
   // |callback| must not be null.
-  void MoveEntryFromRootDirectory(const FilePath& directory_path,
+  void MoveEntryFromRootDirectory(const base::FilePath& directory_path,
                                   const FileOperationCallback& callback,
                                   DriveFileError error,
-                                  const FilePath& file_path);
+                                  const base::FilePath& file_path);
 
   // Part of Copy(). Called after GetEntryInfoPairByPaths() is
   // complete. |callback| must not be null.
-  void CopyAfterGetEntryInfoPair(const FilePath& dest_file_path,
+  void CopyAfterGetEntryInfoPair(const base::FilePath& dest_file_path,
                                  const FileOperationCallback& callback,
                                  scoped_ptr<EntryInfoPairResult> result);
 
@@ -145,10 +146,10 @@ class CopyOperation {
   // |local_file_path| to |remote_dest_file_path|.
   //
   // Can be called from UI thread. |callback| is run on the calling thread.
-  void OnGetFileCompleteForCopy(const FilePath& remote_dest_file_path,
+  void OnGetFileCompleteForCopy(const base::FilePath& remote_dest_file_path,
                                 const FileOperationCallback& callback,
                                 DriveFileError error,
-                                const FilePath& local_file_path,
+                                const base::FilePath& local_file_path,
                                 const std::string& unused_mime_type,
                                 DriveFileType file_type);
 
@@ -170,15 +171,15 @@ class CopyOperation {
   void OnTransferCompleted(
       const FileOperationCallback& callback,
       google_apis::DriveUploadError error,
-      const FilePath& drive_path,
+      const base::FilePath& drive_path,
-      const FilePath& file_path,
+      const base::FilePath& file_path,
       scoped_ptr<google_apis::ResourceEntry> resource_entry);
 
   // Part of TransferFileFromLocalToRemote(). Called after
   // GetEntryInfoByPath() is complete.
   void TransferFileFromLocalToRemoteAfterGetEntryInfo(
-      const FilePath& local_src_file_path,
+      const base::FilePath& local_src_file_path,
-      const FilePath& remote_dest_file_path,
+      const base::FilePath& remote_dest_file_path,
       const FileOperationCallback& callback,
       DriveFileError error,
       scoped_ptr<DriveEntryProto> entry_proto);
@@ -192,8 +193,8 @@ class CopyOperation {
   //
   // Must be called from *UI* thread. |callback| is run on the calling thread.
   // |callback| must not be null.
-  void TransferFileForResourceId(const FilePath& local_file_path,
+  void TransferFileForResourceId(const base::FilePath& local_file_path,
-                                 const FilePath& remote_dest_file_path,
+                                 const base::FilePath& remote_dest_file_path,
                                  const FileOperationCallback& callback,
                                  const std::string& resource_id);
 

chrome/browser/chromeos/drive/file_system/drive_operations.h

@@ -9,7 +9,9 @@
 #include "base/sequenced_task_runner.h"
 #include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
 
+namespace base {
 class FilePath;
+}
 
 namespace google_apis {
 class DriveUploaderInterface;
@@ -52,37 +54,38 @@ class DriveOperations {
 
   // Wrapper function for copy_operation_.
   // |callback| must not be null.
-  void Copy(const FilePath& src_file_path,
+  void Copy(const base::FilePath& src_file_path,
-            const FilePath& dest_file_path,
+            const base::FilePath& dest_file_path,
             const FileOperationCallback& callback);
 
   // Wrapper function for copy_operation_.
   // |callback| must not be null.
-  void TransferFileFromRemoteToLocal(const FilePath& remote_src_file_path,
+  void TransferFileFromRemoteToLocal(const base::FilePath& remote_src_file_path,
-                                     const FilePath& local_dest_file_path,
+                                     const base::FilePath& local_dest_file_path,
                                      const FileOperationCallback& callback);
 
   // Wrapper function for copy_operation_.
   // |callback| must not be null.
-  void TransferFileFromLocalToRemote(const FilePath& local_src_file_path,
+  void TransferFileFromLocalToRemote(
-                                     const FilePath& remote_dest_file_path,
+      const base::FilePath& local_src_file_path,
-                                     const FileOperationCallback& callback);
+      const base::FilePath& remote_dest_file_path,
+      const FileOperationCallback& callback);
 
   // Wrapper function for copy_operation_.
   // |callback| must not be null.
-  void TransferRegularFile(const FilePath& local_src_file_path,
+  void TransferRegularFile(const base::FilePath& local_src_file_path,
-                           const FilePath& remote_dest_file_path,
+                           const base::FilePath& remote_dest_file_path,
                            const FileOperationCallback& callback);
 
   // Wrapper function for move_operation_.
   // |callback| must not be null.
-  void Move(const FilePath& src_file_path,
+  void Move(const base::FilePath& src_file_path,
-            const FilePath& dest_file_path,
+            const base::FilePath& dest_file_path,
             const FileOperationCallback& callback);
 
   // Wrapper function for remove_operation_.
   // |callback| must not be null.
-  void Remove(const FilePath& file_path,
+  void Remove(const base::FilePath& file_path,
               bool is_recursive,
               const FileOperationCallback& callback);
 

chrome/browser/chromeos/drive/file_system/move_operation.h

@@ -11,9 +11,12 @@
 #include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
 #include "chrome/browser/google_apis/gdata_errorcode.h"
 
-class FilePath;
 class GURL;
 
+namespace base {
+class FilePath;
+}
+
 namespace drive {
 
 class DriveCache;
@@ -38,14 +41,14 @@ class MoveOperation {
   // Performs the move operation on the file at drive path |src_file_path|
   // with a target of |dest_file_path|.  Invokes |callback| when finished with
   // the result of the operation. |callback| must not be null.
-  virtual void Move(const FilePath& src_file_path,
+  virtual void Move(const base::FilePath& src_file_path,
-                    const FilePath& dest_file_path,
+                    const base::FilePath& dest_file_path,
                     const FileOperationCallback& callback);
  private:
   // Part of Move(). Called after GetEntryInfoPairByPaths() is
   // complete. |callback| must not be null.
   void MoveAfterGetEntryInfoPair(
-    const FilePath& dest_file_path,
+    const base::FilePath& dest_file_path,
     const FileOperationCallback& callback,
     scoped_ptr<EntryInfoPairResult> result);
 
@@ -53,7 +56,7 @@ class MoveOperation {
   // FileMoveCallback to FileOperationCallback.
   void OnFilePathUpdated(const FileOperationCallback& cllback,
                          DriveFileError error,
-                         const FilePath& file_path);
+                         const base::FilePath& file_path);
 
   // Renames a file or directory at |file_path| to |new_name| in the same
   // directory. |callback| will receive the new file path if the operation is
@@ -63,14 +66,14 @@ class MoveOperation {
   //
   // Can be called from UI thread. |callback| is run on the calling thread.
   // |callback| must not be null.
-  void Rename(const FilePath& file_path,
+  void Rename(const base::FilePath& file_path,
-              const FilePath::StringType& new_name,
+              const base::FilePath::StringType& new_name,
               const FileMoveCallback& callback);
 
   // Part of Rename(). Called after GetEntryInfoByPath() is complete.
   // |callback| must not be null.
-  void RenameAfterGetEntryInfo(const FilePath& file_path,
+  void RenameAfterGetEntryInfo(const base::FilePath& file_path,
-                               const FilePath::StringType& new_name,
+                               const base::FilePath::StringType& new_name,
                                const FileMoveCallback& callback,
                                DriveFileError error,
                                scoped_ptr<DriveEntryProto> entry_proto);
@@ -78,8 +81,8 @@ class MoveOperation {
   // Callback for handling resource rename attempt. Renames a file or
   // directory at |file_path| on the client side.
   // |callback| must not be null.
-  void RenameEntryLocally(const FilePath& file_path,
+  void RenameEntryLocally(const base::FilePath& file_path,
-                          const FilePath::StringType& new_name,
+                          const base::FilePath::StringType& new_name,
                           const FileMoveCallback& callback,
                           google_apis::GDataErrorCode status);
 
@@ -90,7 +93,7 @@ class MoveOperation {
   // |callback| must not be null.
   void RemoveEntryFromDirectory(const FileMoveCallback& callback,
                                 DriveFileError error,
-                                const FilePath& file_path);
+                                const base::FilePath& file_path);
 
   // Part of RemoveEntryFromDirectory(). Called after
   // GetEntryInfoPairByPaths() is complete. |callback| must not be null.
@@ -103,10 +106,10 @@ class MoveOperation {
   //
   // Can be called from UI thread. |callback| is run on the calling thread.
   // |callback| must not be null.
-  void AddEntryToDirectory(const FilePath& directory_path,
+  void AddEntryToDirectory(const base::FilePath& directory_path,
                            const FileOperationCallback& callback,
                            DriveFileError error,
-                           const FilePath& file_path);
+                           const base::FilePath& file_path);
 
   // Part of AddEntryToDirectory(). Called after
   // GetEntryInfoPairByPaths() is complete. |callback| must not be null.
@@ -117,8 +120,8 @@ class MoveOperation {
   // Moves entry specified by |file_path| to the directory specified by
   // |dir_path| and calls |callback| asynchronously.
   // |callback| must not be null.
-  void MoveEntryToDirectory(const FilePath& file_path,
+  void MoveEntryToDirectory(const base::FilePath& file_path,
-                            const FilePath& directory_path,
+                            const base::FilePath& directory_path,
                             const FileMoveCallback& callback,
                             google_apis::GDataErrorCode status);
 
@@ -128,7 +131,7 @@ class MoveOperation {
   void NotifyAndRunFileOperationCallback(
       const FileOperationCallback& callback,
       DriveFileError error,
-      const FilePath& moved_file_path);
+      const base::FilePath& moved_file_path);
 
   // Callback when an entry is moved to another directory on the client side.
   // Notifies the directory change and runs |callback|.
@@ -136,7 +139,7 @@ class MoveOperation {
   void NotifyAndRunFileMoveCallback(
       const FileMoveCallback& callback,
       DriveFileError error,
-      const FilePath& moved_file_path);
+      const base::FilePath& moved_file_path);
 
   DriveScheduler* drive_scheduler_;
   DriveResourceMetadata* metadata_;

chrome/browser/chromeos/drive/file_system/operation_observer.h

@@ -5,7 +5,9 @@
 #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_OPERATION_OBSERVER_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_OPERATION_OBSERVER_H_
 
+namespace base {
 class FilePath;
+}
 
 namespace drive {
 namespace file_system {
@@ -17,7 +19,7 @@ class OperationObserver {
   // |directory_path| is a virtual directory path representing the
   // changed directory.
   virtual void OnDirectoryChangedByOperation(
-      const FilePath& directory_path) = 0;
+      const base::FilePath& directory_path) = 0;
 };
 
 }  // namespace file_system

chrome/browser/chromeos/drive/file_system/remove_operation.h

@@ -11,9 +11,12 @@
 #include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
 #include "chrome/browser/google_apis/gdata_errorcode.h"
 
-class FilePath;
 class GURL;
 
+namespace base {
+class FilePath;
+}
+
 namespace google_apis {
 }
 
@@ -42,7 +45,7 @@ class RemoveOperation {
   // Perform the remove operation on the file at drive path |file_path|.
   // Invokes |callback| when finished with the result of the operation.
   // |callback| must not be null.
-  virtual void Remove(const FilePath& file_path,
+  virtual void Remove(const base::FilePath& file_path,
                       bool is_recursive,
                       const FileOperationCallback& callback);
 
@@ -67,7 +70,7 @@ class RemoveOperation {
   void NotifyDirectoryChanged(
       const FileOperationCallback& callback,
       DriveFileError error,
-      const FilePath& directory_path);
+      const base::FilePath& directory_path);
 
   DriveScheduler* drive_scheduler_;
   DriveCache* cache_;

chrome/browser/chromeos/drive/file_system/update_operation.h

@@ -11,9 +11,12 @@
 #include "chrome/browser/chromeos/drive/drive_resource_metadata.h"
 #include "chrome/browser/google_apis/gdata_errorcode.h"
 
-class FilePath;
 class GURL;
 
+namespace base {
+class FilePath;
+}
+
 namespace google_apis {
 class DriveUploaderInterface;
 }
@@ -58,7 +61,7 @@ class UpdateOperation {
   void UpdateFileByEntryInfo(
       const FileOperationCallback& callback,
       DriveFileError error,
-      const FilePath& drive_file_path,
+      const base::FilePath& drive_file_path,
       scoped_ptr<DriveEntryProto> entry_proto);
 
   // Part of UpdateFileByResourceId().
@@ -66,10 +69,10 @@ class UpdateOperation {
   // UpdateFileByResourceId().
   // |callback| must not be null.
   void OnGetFileCompleteForUpdateFile(const FileOperationCallback& callback,
-                                      const FilePath& drive_file_path,
+                                      const base::FilePath& drive_file_path,
                                       scoped_ptr<DriveEntryProto> entry_proto,
                                       DriveFileError error,
-                                      const FilePath& cache_file_path);
+                                      const base::FilePath& cache_file_path);
 
   // Part of UpdateFileByResourceId().
   // Called when DriveUploader::UploadUpdatedFile() is completed for
@@ -78,15 +81,15 @@ class UpdateOperation {
   void OnUpdatedFileUploaded(
       const FileOperationCallback& callback,
       google_apis::DriveUploadError error,
-      const FilePath& gdata_path,
+      const base::FilePath& gdata_path,
-      const FilePath& file_path,
+      const base::FilePath& file_path,
       scoped_ptr<google_apis::ResourceEntry> resource_entry);
 
   // Part of UpdateFileByResourceId().
   // |callback| must not be null.
   void OnUpdatedFileRefreshed(const FileOperationCallback& callback,
                               DriveFileError error,
-                              const FilePath& drive_file_path,
+                              const base::FilePath& drive_file_path,
                               scoped_ptr<DriveEntryProto> entry_proto);
 
   DriveCache* cache_;

chrome/browser/chromeos/drive/file_write_helper.h

@@ -9,7 +9,9 @@
 #include "chrome/browser/chromeos/drive/drive_file_error.h"
 #include "chrome/browser/chromeos/drive/drive_file_system_interface.h"
 
+namespace base {
 class FilePath;
+}
 
 namespace drive {
 
@@ -26,7 +28,7 @@ class FileWriteHelper {
   // file is created.
   //
   // Must be called from UI thread.
-  void PrepareWritableFileAndRun(const FilePath& path,
+  void PrepareWritableFileAndRun(const base::FilePath& path,
                                  const OpenFileCallback& callback);
 
  private:
@@ -34,15 +36,15 @@ class FileWriteHelper {
   // file does not exist yet, does OpenFile to download and mark the file as
   // dirty, runs |callback|, and finally calls CloseFile.
   void PrepareWritableFileAndRunAfterCreateFile(
-      const FilePath& file_path,
+      const base::FilePath& file_path,
       const OpenFileCallback& callback,
       DriveFileError result);
   void PrepareWritableFileAndRunAfterOpenFile(
-      const FilePath& file_path,
+      const base::FilePath& file_path,
       const OpenFileCallback& callback,
       DriveFileError result,
-      const FilePath& local_cache_path);
+      const base::FilePath& local_cache_path);
-  void PrepareWritableFileAndRunAfterCallback(const FilePath& file_path);
+  void PrepareWritableFileAndRunAfterCallback(const base::FilePath& file_path);
 
   // File system owned by DriveSystemService.
   DriveFileSystemInterface* file_system_;

chrome/browser/chromeos/enterprise_extension_observer.h

@@ -13,9 +13,12 @@
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 
-class FilePath;
 class Profile;
 
+namespace base {
+class FilePath;
+}
+
 namespace chromeos {
 
 // This observer listens for installed extensions and restarts the ChromeOS
@@ -31,7 +34,7 @@ class EnterpriseExtensionObserver
                        const content::NotificationDetails& details) OVERRIDE;
 
  private:
-  static void CheckExtensionAndNotifyEntd(const FilePath& path);
+  static void CheckExtensionAndNotifyEntd(const base::FilePath& path);
   static void NotifyEntd();
 
   Profile* profile_;

chrome/browser/chromeos/imageburner/burn_controller.h

@@ -10,9 +10,8 @@
 #include "base/basictypes.h"
 #include "chromeos/disks/disk_mount_manager.h"
 
-class FilePath;
-
 namespace base {
+class FilePath;
 class TimeDelta;
 }
 
@@ -69,8 +68,8 @@ class BurnController {
   // Returns devices on which we can burn recovery image.
   virtual std::vector<disks::DiskMountManager::Disk> GetBurnableDevices() = 0;
   // Starts burning process.
-  virtual void StartBurnImage(const FilePath& target_device_path,
+  virtual void StartBurnImage(const base::FilePath& target_device_path,
-                              const FilePath& target_file_path) = 0;
+                              const base::FilePath& target_file_path) = 0;
   // Cancels burning process.
   virtual void CancelBurnImage() = 0;
   // Creates a new instance of BurnController.

chrome/browser/chromeos/login/user_image_manager.h

@@ -9,9 +9,12 @@
 
 #include "chrome/browser/chromeos/login/user.h"
 
-class FilePath;
 class PrefServiceSimple;
 
+namespace base {
+class FilePath;
+}
+
 namespace gfx {
 class ImageSkia;
 }
@@ -49,7 +52,7 @@ class UserImageManager {
   // Tries to load user image from disk; if successful, sets it for the user,
   // sends LOGIN_USER_IMAGE_CHANGED notification and updates Local State.
   virtual void SaveUserImageFromFile(const std::string& username,
-                                     const FilePath& path) = 0;
+                                     const base::FilePath& path) = 0;
 
   // Sets profile image as user image for |username|, sends
   // LOGIN_USER_IMAGE_CHANGED notification and updates Local State. If the user

chrome/browser/chromeos/login/user_image_manager_impl.h

@@ -21,6 +21,10 @@
 class ProfileDownloader;
 class UserImage;
 
+namespace base {
+class FilePath;
+}
+
 namespace chromeos {
 
 class UserImageManagerImpl : public UserImageManager,
@@ -39,7 +43,7 @@ class UserImageManagerImpl : public UserImageManager,
   virtual void SaveUserImage(const std::string& username,
                              const UserImage& user_image) OVERRIDE;
   virtual void SaveUserImageFromFile(const std::string& username,
-                                     const FilePath& path) OVERRIDE;
+                                     const base::FilePath& path) OVERRIDE;
   virtual void SaveUserImageFromProfileImage(
       const std::string& username) OVERRIDE;
   virtual void DeleteUserImage(const std::string& username) OVERRIDE;
@@ -63,7 +67,7 @@ class UserImageManagerImpl : public UserImageManager,
       ProfileDownloaderDelegate::FailureReason reason) OVERRIDE;
 
   // Returns image filepath for the given user.
-  FilePath GetImagePathForUser(const std::string& username);
+  base::FilePath GetImagePathForUser(const std::string& username);
 
   // Sets one of the default images for the specified user and saves this
   // setting in local state.
@@ -90,7 +94,7 @@ class UserImageManagerImpl : public UserImageManager,
   // Local State on UI thread.
   void SaveImageToFile(const std::string& username,
                        const UserImage& user_image,
-                       const FilePath& image_path,
+                       const base::FilePath& image_path,
                        int image_index,
                        const GURL& image_url);
 
@@ -105,7 +109,7 @@ class UserImageManagerImpl : public UserImageManager,
 
   // Saves |image| to the specified |image_path|. Runs on FILE thread.
   bool SaveBitmapToFile(const UserImage& user_image,
-                        const FilePath& image_path);
+                        const base::FilePath& image_path);
 
   // Initializes |downloaded_profile_image_| with the picture of the logged-in
   // user.

chrome/browser/chromeos/login/user_manager_impl.h

@@ -24,7 +24,6 @@
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
-class FilePath;
 class PrefService;
 class ProfileSyncService;
 

chrome/browser/chromeos/mobile_config.h

@@ -15,10 +15,9 @@
 #include "base/time.h"
 #include "chrome/browser/chromeos/customization_document.h"
 
-class FilePath;
-
 namespace base {
 class DictionaryValue;
+class FilePath;
 }
 
 namespace chromeos {
@@ -180,8 +179,8 @@ class MobileConfig : public CustomizationDocument  {
                      const std::string& local_config);
 
   // Executes on FILE thread and reads config files to string.
-  void ReadConfigInBackground(const FilePath& global_config_file,
+  void ReadConfigInBackground(const base::FilePath& global_config_file,
-                              const FilePath& local_config_file);
+                              const base::FilePath& local_config_file);
 
   // Maps external carrier ID to internal carrier ID.
   CarrierIdMap carrier_id_map_;

chrome/browser/chromeos/settings/owner_key_util.h

@@ -14,7 +14,9 @@
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 
+namespace base {
 class FilePath;
+}
 
 namespace crypto {
 class RSAPrivateKey;
@@ -59,7 +61,7 @@ class OwnerKeyUtilImpl : public OwnerKeyUtil {
   // key will live.
   static const char kOwnerKeyFile[];
 
-  explicit OwnerKeyUtilImpl(const FilePath& public_key_file);
+  explicit OwnerKeyUtilImpl(const base::FilePath& public_key_file);
 
   // OwnerKeyUtil:
   virtual bool ImportPublicKey(std::vector<uint8>* output) OVERRIDE;
@@ -72,7 +74,7 @@ class OwnerKeyUtilImpl : public OwnerKeyUtil {
 
  private:
   // The file that holds the public key.
-  FilePath key_file_;
+  base::FilePath key_file_;
 
   DISALLOW_COPY_AND_ASSIGN(OwnerKeyUtilImpl);
 };

chrome/browser/chromeos/system/name_value_pairs_parser.h

@@ -10,7 +10,9 @@
 
 #include "base/basictypes.h"
 
+namespace base {
 class FilePath;
+}
 
 namespace chromeos {
 namespace system {
@@ -36,7 +38,7 @@ class NameValuePairsParser {
   // Parses name-value pairs from the file.
   // Returns false if there was any error in the file. Valid pairs will still be
   // added to the map.
-  bool GetNameValuePairsFromFile(const FilePath& file_path,
+  bool GetNameValuePairsFromFile(const base::FilePath& file_path,
                                  const std::string& eq,
                                  const std::string& delim);
 

chrome/browser/component_updater/component_updater_service.h

@@ -11,14 +11,13 @@
 #include "base/version.h"
 #include "googleurl/src/gurl.h"
 
-class FilePath;
-
 namespace net {
 class URLRequestContextGetter;
 }
 
 namespace base {
 class DictionaryValue;
+class FilePath;
 }
 
 // Component specific installers must derive from this class and implement
@@ -36,7 +35,7 @@ class ComponentInstaller {
   // json dictionary and |unpack_path| contains the temporary directory
   // with all the unpacked CRX files.
   virtual bool Install(base::DictionaryValue* manifest,
-                       const FilePath& unpack_path) = 0;
+                       const base::FilePath& unpack_path) = 0;
 
  protected:
   virtual ~ComponentInstaller() {}

chrome/browser/devtools/devtools_file_helper.h

@@ -14,9 +14,12 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 
-class FilePath;
 class Profile;
 
+namespace base {
+class FilePath;
+}
+
 namespace content {
 class WebContents;
 }
@@ -84,19 +87,21 @@ class DevToolsFileHelper {
   void SaveAsFileSelected(const std::string& url,
                           const std::string& content,
                           const SaveCallback& callback,
-                          const FilePath& path);
+                          const base::FilePath& path);
   void SaveAsFileSelectionCanceled();
   void InnerAddFileSystem(const AddFileSystemCallback& callback,
-                          const FilePath& path);
+                          const base::FilePath& path);
-  void AddValidatedFileSystem(const AddFileSystemCallback& callback,
+  void AddValidatedFileSystem(
-                              const std::vector<FilePath>& permitted_paths);
+      const AddFileSystemCallback& callback,
-  void RestoreValidatedFileSystems(const RequestFileSystemsCallback& callback,
+      const std::vector<base::FilePath>& permitted_paths);
-                                   const std::vector<FilePath>& file_paths);
+  void RestoreValidatedFileSystems(
+      const RequestFileSystemsCallback& callback,
+      const std::vector<base::FilePath>& file_paths);
 
   content::WebContents* web_contents_;
   Profile* profile_;
   base::WeakPtrFactory<DevToolsFileHelper> weak_factory_;
-  typedef std::map<std::string, FilePath> PathsMap;
+  typedef std::map<std::string, base::FilePath> PathsMap;
   PathsMap saved_files_;
   DISALLOW_COPY_AND_ASSIGN(DevToolsFileHelper);
 };

chrome/browser/diagnostics/diagnostics_test.h

@@ -9,7 +9,9 @@
 #include "base/string16.h"
 #include "chrome/browser/diagnostics/diagnostics_model.h"
 
+namespace base {
 class FilePath;
+}
 
 // Represents a single diagnostic test and encapsulates the common
 // functionality across platforms as well.
@@ -55,7 +57,7 @@ class DiagnosticTest : public DiagnosticsModel::TestInfo {
   void RecordOutcome(const string16& additional_info,
                      DiagnosticsModel::TestResult result);
 
-  static FilePath GetUserDefaultProfileDir();
+  static base::FilePath GetUserDefaultProfileDir();
 
  protected:
   // The id needs to be overridden by derived classes and must uniquely

chrome/browser/download/download_file_picker.h

@@ -8,7 +8,9 @@
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "ui/shell_dialogs/select_file_dialog.h"
 
+namespace base {
 class FilePath;
+}
 
 namespace content {
 class DownloadItem;
@@ -24,7 +26,7 @@ class DownloadFilePicker : public ui::SelectFileDialog::Listener {
 
   void Init(content::DownloadManager* download_manager,
             content::DownloadItem* item,
-            const FilePath& suggested_path,
+            const base::FilePath& suggested_path,
             const ChromeDownloadManagerDelegate::FileSelectedCallback&
                 callback);
 
@@ -33,28 +35,28 @@ class DownloadFilePicker : public ui::SelectFileDialog::Listener {
   // method should be overridden to set the correct suggested path to prompt the
   // user.
   virtual void InitSuggestedPath(content::DownloadItem* item,
-                                 const FilePath& suggested_path);
+                                 const base::FilePath& suggested_path);
 
-  void set_suggested_path(const FilePath& suggested_path) {
+  void set_suggested_path(const base::FilePath& suggested_path) {
     suggested_path_ = suggested_path;
   }
 
   // Runs |file_selected_callback_| with |path| and then deletes this object.
-  void OnFileSelected(const FilePath& path);
+  void OnFileSelected(const base::FilePath& path);
 
-  void RecordFileSelected(const FilePath& path);
+  void RecordFileSelected(const base::FilePath& path);
 
   scoped_refptr<content::DownloadManager> download_manager_;
   int32 download_id_;
 
  private:
   // SelectFileDialog::Listener implementation.
-  virtual void FileSelected(const FilePath& path,
+  virtual void FileSelected(const base::FilePath& path,
                             int index,
                             void* params) OVERRIDE;
   virtual void FileSelectionCanceled(void* params) OVERRIDE;
 
-  FilePath suggested_path_;
+  base::FilePath suggested_path_;
 
   ChromeDownloadManagerDelegate::FileSelectedCallback file_selected_callback_;
 

chrome/browser/download/download_path_reservation_tracker.h

@@ -63,12 +63,14 @@
 // It considers 'foo/bar/x.pdf' and 'foo/baz/x.pdf' to be two different paths,
 // even though 'bar' might be a symlink to 'baz'.
 
+namespace base {
+class FilePath;
+}
+
 namespace content {
 class DownloadItem;
 }
 
-class FilePath;
-
 // Issues and tracks download paths that are in use by the download system. When
 // a target path is set for a download, this object tracks the path and the
 // associated download item so that subsequent downloads can avoid using the
@@ -84,7 +86,7 @@ class DownloadPathReservationTracker {
   //
   // If |requested_target_path| was not writeable, then the parent directory of
   // |target_path| may be different from that of |requested_target_path|.
-  typedef base::Callback<void(const FilePath& target_path,
+  typedef base::Callback<void(const base::FilePath& target_path,
                               bool target_path_verified)> ReservedPathCallback;
 
   // The largest index for the uniquification suffix that we will try while
@@ -99,14 +101,14 @@ class DownloadPathReservationTracker {
   // directory does not exist and is the parent directory of
   // |requested_target_path|, the directory will be created.
   static void GetReservedPath(content::DownloadItem& download_item,
-                              const FilePath& requested_target_path,
+                              const base::FilePath& requested_target_path,
-                              const FilePath& default_download_path,
+                              const base::FilePath& default_download_path,
                               bool should_uniquify_path,
                               const ReservedPathCallback& callback);
 
   // Returns true if |path| is in use by an existing path reservation. Should
   // only be called on the FILE thread. Currently only used by tests.
-  static bool IsPathInUseForTesting(const FilePath& path);
+  static bool IsPathInUseForTesting(const base::FilePath& path);
 };
 
 #endif  // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_PATH_RESERVATION_TRACKER_H_

chrome/browser/enumerate_modules_model_win.h

@@ -17,9 +17,9 @@
 #include "googleurl/src/gurl.h"
 
 class EnumerateModulesModel;
-class FilePath;
 
 namespace base {
+class FilePath;
 class ListValue;
 }
 
@@ -191,7 +191,7 @@ class ModuleEnumerator : public base::RefCountedThreadSafe<ModuleEnumerator> {
 
   // Given a filename, returns the Subject (who signed it) retrieved from
   // the digital signature (Authenticode).
-  string16 GetSubjectNameFromDigitalSignature(const FilePath& filename);
+  string16 GetSubjectNameFromDigitalSignature(const base::FilePath& filename);
 
   // The typedef for the vector that maps a regular file path to %env_var%.
   typedef std::vector< std::pair<string16, string16> > PathMapping;

chrome/browser/extensions/activity_database.h

@@ -14,7 +14,9 @@
 #include "sql/connection.h"
 #include "sql/init_status.h"
 
+namespace base {
 class FilePath;
+}
 
 namespace extensions {
 
@@ -30,7 +32,7 @@ class ActivityDatabase : public base::RefCountedThreadSafe<ActivityDatabase> {
   void SetErrorDelegate(sql::ErrorDelegate* error_delegate);
 
   // Opens the DB and creates tables as necessary.
-  void Init(const FilePath& db_name);
+  void Init(const base::FilePath& db_name);
   void LogInitFailure();
 
   // Record a UrlAction in the database.

chrome/browser/extensions/api/bookmarks/bookmarks_api.h

@@ -17,9 +17,8 @@
 #include "chrome/browser/extensions/extension_function.h"
 #include "ui/shell_dialogs/select_file_dialog.h"
 
-class FilePath;
-
 namespace base {
+class FilePath;
 class ListValue;
 }
 
@@ -274,10 +273,10 @@ class BookmarksIOFunction : public BookmarksFunction,
  public:
   BookmarksIOFunction();
 
-  virtual void FileSelected(const FilePath& path, int index, void* params) = 0;
+  virtual void FileSelected(const base::FilePath& path, int index, void* params) = 0;
 
   // ui::SelectFileDialog::Listener:
-  virtual void MultiFilesSelected(const std::vector<FilePath>& files,
+  virtual void MultiFilesSelected(const std::vector<base::FilePath>& files,
                                   void* params) OVERRIDE;
   virtual void FileSelectionCanceled(void* params) OVERRIDE;
 
@@ -289,7 +288,7 @@ class BookmarksIOFunction : public BookmarksFunction,
  private:
   void ShowSelectFileDialog(
       ui::SelectFileDialog::Type type,
-      const FilePath& default_path);
+      const base::FilePath& default_path);
 
  protected:
   scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
@@ -300,7 +299,7 @@ class BookmarksImportFunction : public BookmarksIOFunction {
   DECLARE_EXTENSION_FUNCTION("bookmarks.import", BOOKMARKS_IMPORT)
 
   // BookmarkManagerIOFunction:
-  virtual void FileSelected(const FilePath& path,
+  virtual void FileSelected(const base::FilePath& path,
                             int index,
                             void* params) OVERRIDE;
 
@@ -316,7 +315,7 @@ class BookmarksExportFunction : public BookmarksIOFunction {
   DECLARE_EXTENSION_FUNCTION("bookmarks.export", BOOKMARKS_EXPORT)
 
   // BookmarkManagerIOFunction:
-  virtual void FileSelected(const FilePath& path,
+  virtual void FileSelected(const base::FilePath& path,
                             int index,
                             void* params) OVERRIDE;
 

chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.h

@@ -13,7 +13,6 @@
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/media_gallery/media_galleries_preferences.h"
 
-class FilePath;
 class Profile;
 
 namespace extensions {

chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.h

@@ -19,7 +19,6 @@
 #include "chrome/browser/media_gallery/media_galleries_preferences.h"
 #include "chrome/browser/system_monitor/removable_storage_observer.h"
 
-class FilePath;
 class Profile;
 
 namespace base {

chrome/browser/extensions/api/messaging/native_process_launcher.h

@@ -8,7 +8,9 @@
 #include "base/process.h"
 #include "chrome/browser/extensions/api/messaging/native_message_process_host.h"
 
+namespace base {
 class FilePath;
+}
 
 namespace extensions {
 
@@ -35,7 +37,7 @@ class NativeProcessLauncher {
 
  protected:
   static bool LaunchNativeProcess(
-      const FilePath& path,
+      const base::FilePath& path,
       base::ProcessHandle* native_process_handle,
       base::PlatformFile* read_file,
       base::PlatformFile* write_file);

chrome/browser/extensions/api/page_capture/page_capture_api.h

@@ -12,7 +12,9 @@
 #include "chrome/common/extensions/api/page_capture.h"
 #include "webkit/blob/shareable_file_reference.h"
 
+namespace base {
 class FilePath;
+}
 
 namespace content {
 class WebContents;
@@ -29,7 +31,7 @@ class PageCaptureSaveAsMHTMLFunction : public AsyncExtensionFunction {
    public:
     // Called on the UI thread when the temporary file that contains the
     // generated data has been created.
-    virtual void OnTemporaryFileCreated(const FilePath& temp_file) = 0;
+    virtual void OnTemporaryFileCreated(const base::FilePath& temp_file) = 0;
   };
   static void SetTestDelegate(TestDelegate* delegate);
 
@@ -48,7 +50,7 @@ class PageCaptureSaveAsMHTMLFunction : public AsyncExtensionFunction {
   void ReturnSuccess(int64 file_size);
 
   // Callback called once the MHTML generation is done.
-  void MHTMLGenerated(const FilePath& file_path, int64 mhtml_file_size);
+  void MHTMLGenerated(const base::FilePath& file_path, int64 mhtml_file_size);
 
   // Returns the WebContents we are associated with, NULL if it's been closed.
   content::WebContents* GetWebContents();
@@ -56,7 +58,7 @@ class PageCaptureSaveAsMHTMLFunction : public AsyncExtensionFunction {
   scoped_ptr<extensions::api::page_capture::SaveAsMHTML::Params> params_;
 
   // The path to the temporary file containing the MHTML data.
-  FilePath mhtml_path_;
+  base::FilePath mhtml_path_;
 
   // The file containing the MHTML.
   scoped_refptr<webkit_blob::ShareableFileReference> mhtml_file_;

chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.h

@@ -13,7 +13,9 @@
 #include "chrome/browser/extensions/api/storage/settings_storage_quota_enforcer.h"
 #include "chrome/browser/extensions/api/storage/value_store_cache.h"
 
+namespace base {
 class FilePath;
+}
 
 namespace extensions {
 
@@ -30,7 +32,7 @@ class SyncOrLocalValueStoreCache : public ValueStoreCache {
       const scoped_refptr<SettingsStorageFactory>& factory,
       const SettingsStorageQuotaEnforcer::Limits& quota,
       const scoped_refptr<SettingsObserverList>& observers,
-      const FilePath& profile_path);
+      const base::FilePath& profile_path);
   virtual ~SyncOrLocalValueStoreCache();
 
   SettingsBackend* GetAppBackend() const;
@@ -48,7 +50,7 @@ class SyncOrLocalValueStoreCache : public ValueStoreCache {
   void InitOnFileThread(const scoped_refptr<SettingsStorageFactory>& factory,
                         const SettingsStorageQuotaEnforcer::Limits& quota,
                         const scoped_refptr<SettingsObserverList>& observers,
-                        const FilePath& profile_path);
+                        const base::FilePath& profile_path);
 
   settings_namespace::Namespace settings_namespace_;
   scoped_ptr<SettingsBackend> app_backend_;

chrome/browser/extensions/app_notification_manager.h

@@ -119,7 +119,7 @@ class AppNotificationManager
   virtual ~AppNotificationManager();
 
   // Starts loading storage_ using |storage_path|.
-  void LoadOnFileThread(const FilePath& storage_path);
+  void LoadOnFileThread(const base::FilePath& storage_path);
 
   // Called on the UI thread to handle the loaded results from storage_.
   void HandleLoadResults(NotificationMap* map);

chrome/browser/extensions/app_notification_storage.h

@@ -9,7 +9,9 @@
 
 #include "chrome/browser/extensions/app_notification.h"
 
+namespace base {
 class FilePath;
+}
 
 namespace extensions {
 
@@ -20,7 +22,7 @@ namespace extensions {
 class AppNotificationStorage {
  public:
   // Must be called on the FILE thread. The storage will be created at |path|.
-  static AppNotificationStorage* Create(const FilePath& path);
+  static AppNotificationStorage* Create(const base::FilePath& path);
 
   virtual ~AppNotificationStorage();
 

chrome/browser/extensions/convert_user_script.h

@@ -10,9 +10,12 @@
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
 
-class FilePath;
 class GURL;
 
+namespace base {
+class FilePath;
+}
+
 namespace extensions {
 class Extension;
 
@@ -24,8 +27,8 @@ class Extension;
 // NOTE: The caller takes ownership of the directory at extension->path() on the
 // returned object.
 scoped_refptr<extensions::Extension> ConvertUserScriptToExtension(
-    const FilePath& user_script, const GURL& original_url,
+    const base::FilePath& user_script, const GURL& original_url,
-    const FilePath& extensions_dir, string16* error);
+    const base::FilePath& extensions_dir, string16* error);
 
 }  // namespace extensions
 

chrome/browser/extensions/convert_web_app.h

@@ -9,9 +9,8 @@
 
 #include "base/memory/ref_counted.h"
 
-class FilePath;
-
 namespace base {
+class FilePath;
 class Time;
 }
 
@@ -41,7 +40,7 @@ std::string ConvertTimeToExtensionVersion(const base::Time& time);
 scoped_refptr<Extension> ConvertWebAppToExtension(
     const WebApplicationInfo& web_app_info,
     const base::Time& create_time,
-    const FilePath& extensions_dir);
+    const base::FilePath& extensions_dir);
 
 }  // namespace extensions
 

chrome/browser/extensions/extension_apitest.h

@@ -13,13 +13,14 @@
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "content/public/browser/notification_registrar.h"
 
+namespace base {
 class FilePath;
+}
 
 namespace extensions {
 class Extension;
 }
 
-
 // The general flow of these API tests should work like this:
 // (1) Setup initial browser state (e.g. create some bookmarks for the
 //     bookmark test)
@@ -158,7 +159,7 @@ class ExtensionApiTest : public ExtensionBrowserTest {
   // Start the test WebSocket server, and store details of its state. Those
   // details will be available to javascript tests using
   // chrome.test.getConfig().
-  bool StartWebSocketServer(const FilePath& root_directory);
+  bool StartWebSocketServer(const base::FilePath& root_directory);
 
   // Test that exactly one extension loaded.  If so, return a pointer to
   // the extension.  If not, return NULL and set message_.

chrome/browser/extensions/extension_creator.h

@@ -10,12 +10,14 @@
 
 #include "base/basictypes.h"
 
+namespace base {
+class FilePath;
+}
+
 namespace crypto {
 class RSAPrivateKey;
 }
 
-class FilePath;
-
 namespace extensions {
 
 // This class create an installable extension (.crx file) given an input
@@ -37,10 +39,10 @@ class ExtensionCreator {
   // Categories of error that may need special handling on the UI end.
   enum ErrorType { kOtherError, kCRXExists };
 
-  bool Run(const FilePath& extension_dir,
+  bool Run(const base::FilePath& extension_dir,
-           const FilePath& crx_path,
+           const base::FilePath& crx_path,
-           const FilePath& private_key_path,
+           const base::FilePath& private_key_path,
-           const FilePath& private_key_output_path,
+           const base::FilePath& private_key_output_path,
            int run_flags);
 
   // Returns the error message that will be present if Run(...) returned false.
@@ -56,38 +58,38 @@ class ExtensionCreator {
   // the extension. If not provided, a random key will be created (in which case
   // it is written to |private_key_output_path| -- if provided).
   // |flags| is a bitset of RunFlags values.
-  bool InitializeInput(const FilePath& extension_dir,
+  bool InitializeInput(const base::FilePath& extension_dir,
-                       const FilePath& crx_path,
+                       const base::FilePath& crx_path,
-                       const FilePath& private_key_path,
+                       const base::FilePath& private_key_path,
-                       const FilePath& private_key_output_path,
+                       const base::FilePath& private_key_output_path,
                        int run_flags);
 
   // Validates the manifest by trying to load the extension.
-  bool ValidateManifest(const FilePath& extension_dir,
+  bool ValidateManifest(const base::FilePath& extension_dir,
                         crypto::RSAPrivateKey* key_pair,
                         int run_flags);
 
   // Reads private key from |private_key_path|.
-  crypto::RSAPrivateKey* ReadInputKey(const FilePath& private_key_path);
+  crypto::RSAPrivateKey* ReadInputKey(const base::FilePath& private_key_path);
 
   // Generates a key pair and writes the private key to |private_key_path|
   // if provided.
-  crypto::RSAPrivateKey* GenerateKey(const FilePath& private_key_path);
+  crypto::RSAPrivateKey* GenerateKey(const base::FilePath& private_key_path);
 
   // Creates temporary zip file for the extension.
-  bool CreateZip(const FilePath& extension_dir, const FilePath& temp_path,
+  bool CreateZip(const base::FilePath& extension_dir, const base::FilePath& temp_path,
-                 FilePath* zip_path);
+                 base::FilePath* zip_path);
 
   // Signs the temporary zip and returns the signature.
-  bool SignZip(const FilePath& zip_path,
+  bool SignZip(const base::FilePath& zip_path,
                crypto::RSAPrivateKey* private_key,
                std::vector<uint8>* signature);
 
   // Export installable .crx to |crx_path|.
-  bool WriteCRX(const FilePath& zip_path,
+  bool WriteCRX(const base::FilePath& zip_path,
                 crypto::RSAPrivateKey* private_key,
                 const std::vector<uint8>& signature,
-                const FilePath& crx_path);
+                const base::FilePath& crx_path);
 
   // Holds a message for any error that is raised during Run(...).
   std::string error_message_;

chrome/browser/extensions/extension_creator_filter.h

@@ -7,7 +7,9 @@
 
 #include "base/memory/ref_counted.h"
 
+namespace base {
 class FilePath;
+}
 
 namespace extensions {
 
@@ -18,9 +20,9 @@ class ExtensionCreatorFilter
  public:
   ExtensionCreatorFilter() {}
 
-  // Returns true if the given FilePath should be included in a
+  // Returns true if the given base::FilePath should be included in a
   // packed extension.
-  bool ShouldPackageFile(const FilePath& file_path);
+  bool ShouldPackageFile(const base::FilePath& file_path);
 
  private:
   friend class base::RefCounted<ExtensionCreatorFilter>;

chrome/browser/extensions/external_provider_interface.h

@@ -10,10 +10,13 @@
 #include "base/memory/linked_ptr.h"
 #include "chrome/common/extensions/manifest.h"
 
-class FilePath;
 class GURL;
 class Version;
 
+namespace base {
+class FilePath;
+}
+
 namespace extensions {
 
 // This class is an abstract class for implementing external extensions
@@ -33,7 +36,7 @@ class ExternalProviderInterface {
     virtual bool OnExternalExtensionFileFound(
         const std::string& id,
         const Version* version,
-        const FilePath& path,
+        const base::FilePath& path,
         Manifest::Location location,
         int creation_flags,
         bool mark_acknowledged) = 0;

chrome/browser/extensions/platform_app_launcher.h

@@ -8,9 +8,12 @@
 #include <string>
 
 class CommandLine;
-class FilePath;
 class Profile;
 
+namespace base {
+class FilePath;
+}
+
 namespace content {
 class WebContents;
 class WebIntentsDispatcher;
@@ -27,20 +30,20 @@ class Extension;
 void LaunchPlatformApp(Profile* profile,
                        const Extension* extension,
                        const CommandLine* command_line,
-                       const FilePath& current_directory);
+                       const base::FilePath& current_directory);
 
 // Launches the platform app |extension| with the contents of |file_path|
 // available through the launch data.
 void LaunchPlatformAppWithPath(Profile* profile,
                                const Extension* extension,
-                               const FilePath& file_path);
+                               const base::FilePath& file_path);
 
 // Launches the platform app |extension| with the contents of |file_path|
 // available through the launch data.
 void LaunchPlatformAppWithFileHandler(Profile* profile,
                                       const Extension* extension,
                                       const std::string& handler_id,
-                                      const FilePath& file_path);
+                                      const base::FilePath& file_path);
 
 #if defined(ENABLE_WEB_INTENTS)
 // Launches the platform app |extension| with the supplied web intent. Creates

chrome/browser/extensions/test_extension_system.h

@@ -8,8 +8,9 @@
 #include "chrome/browser/extensions/extension_system.h"
 
 class CommandLine;
-class FilePath;
+
 namespace base {
+class FilePath;
 class Time;
 }
 
@@ -27,7 +28,7 @@ class TestExtensionSystem : public ExtensionSystem {
   // Creates an ExtensionService initialized with the testing profile and
   // returns it.
   ExtensionService* CreateExtensionService(const CommandLine* command_line,
-                                           const FilePath& install_directory,
+                                           const base::FilePath& install_directory,
                                            bool autoupdate_enabled);
 
   // Creates an ExtensionProcessManager. If not invoked, the

chrome/browser/extensions/updater/extension_downloader_delegate.h

@@ -11,9 +11,12 @@
 #include "base/time.h"
 #include "chrome/browser/extensions/updater/manifest_fetch_data.h"
 
-class FilePath;
 class GURL;
 
+namespace base {
+class FilePath;
+}
+
 namespace extensions {
 
 class ExtensionDownloaderDelegate {
@@ -80,7 +83,7 @@ class ExtensionDownloaderDelegate {
   // to the delegate.
   virtual void OnExtensionDownloadFinished(
       const std::string& id,
-      const FilePath& path,
+      const base::FilePath& path,
       const GURL& download_url,
       const std::string& version,
       const PingResult& ping_result,

chrome/browser/extensions/webstore_installer.h

@@ -21,9 +21,12 @@
 #include "googleurl/src/gurl.h"
 #include "net/base/net_errors.h"
 
-class FilePath;
 class Profile;
 
+namespace base {
+class FilePath;
+}
+
 namespace content {
 class NavigationController;
 }
@@ -142,7 +145,7 @@ class WebstoreInstaller :public content::NotificationObserver,
 
   // Instead of using the default download directory, use |directory| instead.
   // This does *not* transfer ownership of |directory|.
-  static void SetDownloadDirectoryForTests(FilePath* directory);
+  static void SetDownloadDirectoryForTests(base::FilePath* directory);
 
  private:
   friend struct content::BrowserThread::DeleteOnThread<
@@ -158,7 +161,7 @@ class WebstoreInstaller :public content::NotificationObserver,
   virtual void OnDownloadDestroyed(content::DownloadItem* download) OVERRIDE;
 
   // Starts downloading the extension to |file_path|.
-  void StartDownload(const FilePath& file_path);
+  void StartDownload(const base::FilePath& file_path);
 
   // Reports an install |error| to the delegate for the given extension if this
   // managed its installation. This also removes the associated PendingInstall.

chrome/browser/first_run/first_run.h

@@ -17,12 +17,15 @@
 #include "ui/gfx/native_widget_types.h"
 
 class CommandLine;
-class FilePath;
 class GURL;
 class PrefServiceSyncable;
 class Profile;
 class ProcessSingleton;
 
+namespace base {
+class FilePath;
+}
+
 // This namespace contains the chrome first-run installation actions needed to
 // fully test the custom installer. It also contains the opposite actions to
 // execute during uninstall. When the first run UI is ready we won't
@@ -133,10 +136,10 @@ void DoPostImportTasks(Profile* profile, bool make_chrome_default);
 int ImportNow(Profile* profile, const CommandLine& cmdline);
 
 // Returns the path for the master preferences file.
-FilePath MasterPrefsPath();
+base::FilePath MasterPrefsPath();
 
 // Set a master preferences file path that overrides platform defaults.
-void SetMasterPrefsPathForTesting(const FilePath& master_prefs);
+void SetMasterPrefsPathForTesting(const base::FilePath& master_prefs);
 
 // The master preferences is a JSON file with the same entries as the
 // 'Default\Preferences' file. This function locates this file from a standard
@@ -152,7 +155,7 @@ void SetMasterPrefsPathForTesting(const FilePath& master_prefs);
 // See chrome/installer/util/master_preferences.h for a description of
 // 'master_preferences' file.
 ProcessMasterPreferencesResult ProcessMasterPreferences(
-    const FilePath& user_data_dir,
+    const base::FilePath& user_data_dir,
     MasterPrefs* out_prefs);
 
 // Show the first run search engine bubble at the first appropriate opportunity.

chrome/browser/first_run/first_run_internal.h

@@ -14,7 +14,6 @@
 #include "ui/gfx/native_widget_types.h"
 
 class CommandLine;
-class FilePath;
 class GURL;
 class ImporterHost;
 class ImporterList;
@@ -22,6 +21,10 @@ class Profile;
 class ProcessSingleton;
 class TemplateURLService;
 
+namespace base {
+class FilePath;
+}
+
 namespace installer {
 class MasterPreferences;
 }
@@ -42,12 +45,12 @@ extern FirstRunState first_run_;
 // master preferences. Passes the master preference file path out in
 // master_prefs_path. Returns the pointer to installer::MasterPreferences object
 // if successful; otherwise, returns NULL.
-installer::MasterPreferences* LoadMasterPrefs(FilePath* master_prefs_path);
+installer::MasterPreferences* LoadMasterPrefs(base::FilePath* master_prefs_path);
 
 // Copies user preference file to master preference file. Returns true if
 // successful.
-bool CopyPrefFile(const FilePath& user_data_dir,
+bool CopyPrefFile(const base::FilePath& user_data_dir,
-                  const FilePath& master_prefs_path);
+                  const base::FilePath& master_prefs_path);
 
 // Sets up master preferences by preferences passed by installer.
 void SetupMasterPrefsFromInstallPrefs(
@@ -75,7 +78,7 @@ void DoPostImportPlatformSpecificTasks();
 // Gives the full path to the sentinel file. The file might not exist.
 // This function has a common implementation on OS_POSIX and a windows specific
 // implementation.
-bool GetFirstRunSentinelFilePath(FilePath* path);
+bool GetFirstRunSentinelFilePath(base::FilePath* path);
 
 // This function has a common implementationin for all non-linux platforms, and
 // a linux specific implementation.
@@ -100,7 +103,7 @@ int ImportBookmarkFromFileIfNeeded(Profile* profile,
                                    const CommandLine& cmdline);
 
 #if !defined(OS_WIN)
-bool ImportBookmarks(const FilePath& import_bookmarks_path);
+bool ImportBookmarks(const base::FilePath& import_bookmarks_path);
 #endif
 
 // Shows the EULA dialog if required. Returns true if the EULA is accepted,

chrome/browser/google_apis/drive_api_service.h

@@ -14,10 +14,13 @@
 #include "chrome/browser/google_apis/drive_api_url_generator.h"
 #include "chrome/browser/google_apis/drive_service_interface.h"
 
-class FilePath;
 class GURL;
 class Profile;
 
+namespace base {
+class FilePath;
+}
+
 namespace net {
 class URLRequestContextGetter;
 }  // namespace net
@@ -51,7 +54,7 @@ class DriveAPIService : public DriveServiceInterface,
   virtual void RemoveObserver(DriveServiceObserver* observer) OVERRIDE;
   virtual bool CanStartOperation() const OVERRIDE;
   virtual void CancelAll() OVERRIDE;
-  virtual bool CancelForFilePath(const FilePath& file_path) OVERRIDE;
+  virtual bool CancelForFilePath(const base::FilePath& file_path) OVERRIDE;
   virtual OperationProgressStatusList GetProgressStatusList() const OVERRIDE;
   virtual bool HasAccessToken() const OVERRIDE;
   virtual bool HasRefreshToken() const OVERRIDE;
@@ -74,8 +77,8 @@ class DriveAPIService : public DriveServiceInterface,
       const std::string& resource_id,
       const EntryActionCallback& callback) OVERRIDE;
   virtual void DownloadFile(
-      const FilePath& virtual_path,
+      const base::FilePath& virtual_path,
-      const FilePath& local_cache_path,
+      const base::FilePath& local_cache_path,
       const GURL& content_url,
       const DownloadActionCallback& download_action_callback,
       const GetContentCallback& get_content_callback) OVERRIDE;

chrome/browser/google_apis/drive_uploader.h

@@ -15,17 +15,20 @@
 #include "chrome/browser/google_apis/gdata_errorcode.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
 
-class FilePath;
 class GURL;
 
+namespace base {
+class FilePath;
+}
+
 namespace google_apis {
 class DriveServiceInterface;
 struct ResumeUploadResponse;
 
 // Callback to be invoked once the upload has completed.
 typedef base::Callback<void(DriveUploadError error,
-                            const FilePath& drive_path,
+                            const base::FilePath& drive_path,
-                            const FilePath& file_path,
+                            const base::FilePath& file_path,
                             scoped_ptr<ResourceEntry> resource_entry)>
     UploadCompletionCallback;
 
@@ -55,8 +58,8 @@ class DriveUploaderInterface {
   //   Called when an upload is done regardless of it was successful or not.
   //   Must not be null.
   virtual void UploadNewFile(const GURL& upload_location,
-                             const FilePath& drive_file_path,
+                             const base::FilePath& drive_file_path,
-                             const FilePath& local_file_path,
+                             const base::FilePath& local_file_path,
                              const std::string& title,
                              const std::string& content_type,
                              const UploadCompletionCallback& callback) = 0;
@@ -70,8 +73,8 @@ class DriveUploaderInterface {
   //   fails with UPLOAD_ERROR_CONFLICT.
   //   If |etag| is empty, the test is skipped.
   virtual void UploadExistingFile(const GURL& upload_location,
-                                  const FilePath& drive_file_path,
+                                  const base::FilePath& drive_file_path,
-                                  const FilePath& local_file_path,
+                                  const base::FilePath& local_file_path,
                                   const std::string& content_type,
                                   const std::string& etag,
                                   const UploadCompletionCallback& callback) = 0;
@@ -84,15 +87,15 @@ class DriveUploader : public DriveUploaderInterface {
 
   // DriveUploaderInterface overrides.
   virtual void UploadNewFile(const GURL& upload_location,
-                             const FilePath& drive_file_path,
+                             const base::FilePath& drive_file_path,
-                             const FilePath& local_file_path,
+                             const base::FilePath& local_file_path,
                              const std::string& title,
                              const std::string& content_type,
                              const UploadCompletionCallback& callback) OVERRIDE;
   virtual void UploadExistingFile(
       const GURL& upload_location,
-      const FilePath& drive_file_path,
+      const base::FilePath& drive_file_path,
-      const FilePath& local_file_path,
+      const base::FilePath& local_file_path,
       const std::string& content_type,
       const std::string& etag,
       const UploadCompletionCallback& callback) OVERRIDE;

chrome/browser/google_apis/gdata_wapi_parser.h

@@ -17,12 +17,13 @@
 #include "chrome/browser/google_apis/drive_entry_kinds.h"
 #include "googleurl/src/gurl.h"
 
-class FilePath;
 class Profile;
 
 namespace base {
-class Value;
+class FilePath;
 class DictionaryValue;
+class Value;
+
 template <class StructType>
 class JSONValueConverter;
 
@@ -421,7 +422,7 @@ class ResourceEntry : public FeedEntry {
   static bool ParseChangestamp(const base::Value* value, int64* result);
 
   // Returns true if |file| has one of the hosted document extensions.
-  static bool HasHostedDocumentExtension(const FilePath& file);
+  static bool HasHostedDocumentExtension(const base::FilePath& file);
 
   // The resource ID is used to identify a resource, which looks like:
   // file:d41d8cd98f00b204e9800998ecf8

chrome/browser/google_apis/gdata_wapi_service.h

@@ -15,10 +15,13 @@
 #include "chrome/browser/google_apis/gdata_wapi_operations.h"
 #include "chrome/browser/google_apis/gdata_wapi_url_generator.h"
 
-class FilePath;
 class GURL;
 class Profile;
 
+namespace base {
+class FilePath;
+}
+
 namespace net {
 class URLRequestContextGetter;
 }  // namespace net
@@ -55,7 +58,7 @@ class GDataWapiService : public DriveServiceInterface,
   virtual void RemoveObserver(DriveServiceObserver* observer) OVERRIDE;
   virtual bool CanStartOperation() const OVERRIDE;
   virtual void CancelAll() OVERRIDE;
-  virtual bool CancelForFilePath(const FilePath& file_path) OVERRIDE;
+  virtual bool CancelForFilePath(const base::FilePath& file_path) OVERRIDE;
   virtual OperationProgressStatusList GetProgressStatusList() const OVERRIDE;
   virtual bool HasAccessToken() const OVERRIDE;
   virtual bool HasRefreshToken() const OVERRIDE;
@@ -76,8 +79,8 @@ class GDataWapiService : public DriveServiceInterface,
   virtual void DeleteResource(const std::string& resource_id,
                               const EntryActionCallback& callback) OVERRIDE;
   virtual void DownloadFile(
-      const FilePath& virtual_path,
+      const base::FilePath& virtual_path,
-      const FilePath& local_cache_path,
+      const base::FilePath& local_cache_path,
       const GURL& content_url,
       const DownloadActionCallback& download_action_callback,
       const GetContentCallback& get_content_callback) OVERRIDE;

chrome/browser/google_apis/mock_drive_service.h

@@ -13,7 +13,9 @@
 #include "chrome/browser/google_apis/drive_service_interface.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
+namespace base {
 class FilePath;
+}
 
 namespace google_apis {
 
@@ -30,7 +32,7 @@ class MockDriveService : public DriveServiceInterface {
       void(DriveServiceObserver* observer));
   MOCK_CONST_METHOD0(CanStartOperation, bool());
   MOCK_METHOD0(CancelAll, void(void));
-  MOCK_METHOD1(CancelForFilePath, bool(const FilePath& file_path));
+  MOCK_METHOD1(CancelForFilePath, bool(const base::FilePath& file_path));
   MOCK_CONST_METHOD0(GetProgressStatusList,
       OperationProgressStatusList());
   MOCK_CONST_METHOD0(GetRootResourceId, std::string());
@@ -72,8 +74,8 @@ class MockDriveService : public DriveServiceInterface {
           const GetResourceEntryCallback& callback));
   MOCK_METHOD5(
       DownloadFile,
-      void(const FilePath& virtual_path,
+      void(const base::FilePath& virtual_path,
-          const FilePath& local_cache_path,
+          const base::FilePath& local_cache_path,
           const GURL& content_url,
           const DownloadActionCallback&
           donwload_action_callback,
@@ -151,8 +153,8 @@ class MockDriveService : public DriveServiceInterface {
   // portion of the URL as the temporary file path. If |file_data_| is not null,
   // |file_data_| is written to the temporary file.
   void DownloadFileStub(
-      const FilePath& virtual_path,
+      const base::FilePath& virtual_path,
-      const FilePath& local_tmp_path,
+      const base::FilePath& local_tmp_path,
       const GURL& content_url,
       const DownloadActionCallback& download_action_callback,
       const GetContentCallback& get_content_callback);

chrome/browser/google_apis/test_util.h

@@ -11,9 +11,8 @@
 #include "chrome/browser/google_apis/gdata_errorcode.h"
 #include "googleurl/src/gurl.h"
 
-class FilePath;
-
 namespace base {
+class FilePath;
 class Value;
 }
 
@@ -42,7 +41,7 @@ void RunBlockingPoolTask();
 
 // Returns the absolute path for a test file stored under
 // chrome/test/data/chromeos.
-FilePath GetTestFilePath(const std::string& relative_path);
+base::FilePath GetTestFilePath(const std::string& relative_path);
 
 // Returns the base URL for communicating with the local test server for
 // testing, running at the specified port number.
@@ -103,13 +102,13 @@ void CopyResultsFromGetAppListCallback(
 // Copies the results from DownloadActionCallback.
 void CopyResultsFromDownloadActionCallback(
     GDataErrorCode* error_out,
-    FilePath* temp_file_out,
+    base::FilePath* temp_file_out,
     GDataErrorCode error_in,
-    const FilePath& temp_file_in);
+    const base::FilePath& temp_file_in);
 
 // Returns a HttpResponse created from the given file path.
 scoped_ptr<test_server::HttpResponse> CreateHttpResponseFromFile(
-    const FilePath& file_path);
+    const base::FilePath& file_path);
 
 // Does nothing for ReAuthenticateCallback(). This function should be used
 // if it is not expected to reach this method as there won't be any
@@ -120,7 +119,7 @@ void DoNothingForReAuthenticateCallback(
 // Returns true if |json_data| is not NULL and equals to the content in
 // |expected_json_file_path|. The failure reason will be logged into LOG(ERROR)
 // if necessary.
-bool VerifyJsonData(const FilePath& expected_json_file_path,
+bool VerifyJsonData(const base::FilePath& expected_json_file_path,
                     const base::Value* json_data);
 
 }  // namespace test_util

chrome/browser/google_apis/time_util.h

@@ -9,7 +9,6 @@
 
 #include "base/string_piece.h"
 
-class FilePath;
 class Profile;
 
 namespace base {

chrome/browser/history/archived_database.cc

@@ -24,7 +24,7 @@ ArchivedDatabase::ArchivedDatabase() {
 ArchivedDatabase::~ArchivedDatabase() {
 }
 
-bool ArchivedDatabase::Init(const FilePath& file_name) {
+bool ArchivedDatabase::Init(const base::FilePath& file_name) {
   // Set the database page size to something a little larger to give us
   // better performance (we're typically seek rather than bandwidth limited).
   // This only has an effect before any tables have been created, otherwise

chrome/browser/history/archived_database.h

@@ -12,7 +12,9 @@
 #include "sql/init_status.h"
 #include "sql/meta_table.h"
 
+namespace base {
 class FilePath;
+}
 
 namespace history {
 
@@ -30,7 +32,7 @@ class ArchivedDatabase : public URLDatabase,
 
   // Initializes the database connection. This must return true before any other
   // functions on this class are called.
-  bool Init(const FilePath& file_name);
+  bool Init(const base::FilePath& file_name);
 
   // Transactions on the database. We support nested transactions and only
   // commit when the outermost one is committed (sqlite doesn't support true

chrome/browser/history/download_database.h

@@ -11,8 +11,6 @@
 #include "base/threading/platform_thread.h"
 #include "sql/meta_table.h"
 
-class FilePath;
-
 namespace sql {
 class Connection;
 }

chrome/browser/history/history_database.h

@@ -23,7 +23,9 @@
 #include "chrome/browser/history/android/android_urls_database.h"
 #endif
 
+namespace base {
 class FilePath;
+}
 
 namespace history {
 
@@ -67,7 +69,7 @@ class HistoryDatabase : public DownloadDatabase,
   // Must call this function to complete initialization. Will return
   // sql::INIT_OK on success. Otherwise, no other function should be called. You
   // may want to call BeginExclusiveMode after this when you are ready.
-  sql::InitStatus Init(const FilePath& history_name,
+  sql::InitStatus Init(const base::FilePath& history_name,
                        sql::ErrorDelegate* error_delegate);
 
   // Call to set the mode on the database to exclusive. The default locking mode

chrome/browser/history/history_service.h

@@ -40,7 +40,6 @@
 #endif
 
 class BookmarkService;
-class FilePath;
 class GURL;
 class HistoryURLProvider;
 class PageUsageData;
@@ -49,6 +48,7 @@ class Profile;
 struct HistoryURLProviderParams;
 
 namespace base {
+class FilePath;
 class Thread;
 }
 
@@ -129,7 +129,7 @@ class HistoryService : public CancelableRequestProvider,
   // not call any other functions. The given directory will be used for storing
   // the history files. The BookmarkService is used when deleting URLs to
   // test if a URL is bookmarked; it may be NULL during testing.
-  bool Init(const FilePath& history_dir, BookmarkService* bookmark_service) {
+  bool Init(const base::FilePath& history_dir, BookmarkService* bookmark_service) {
     return Init(history_dir, bookmark_service, false);
   }
 
@@ -666,7 +666,7 @@ class HistoryService : public CancelableRequestProvider,
 
   // Low-level Init().  Same as the public version, but adds a |no_db| parameter
   // that is only set by unittests which causes the backend to not init its DB.
-  bool Init(const FilePath& history_dir,
+  bool Init(const base::FilePath& history_dir,
             BookmarkService* bookmark_service,
             bool no_db);
 
@@ -1094,7 +1094,7 @@ class HistoryService : public CancelableRequestProvider,
   int current_backend_id_;
 
   // Cached values from Init(), used whenever we need to reload the backend.
-  FilePath history_dir_;
+  base::FilePath history_dir_;
   BookmarkService* bookmark_service_;
   bool no_db_;
 

chrome/browser/history/in_memory_database.h

@@ -9,7 +9,9 @@
 #include "chrome/browser/history/url_database.h"
 #include "sql/connection.h"
 
+namespace base {
 class FilePath;
+}
 
 namespace history {
 
@@ -28,7 +30,7 @@ class InMemoryDatabase : public URLDatabase {
   // file. Conceptually, the InMemoryHistoryBackend should do the populating
   // after this object does some common initialization, but that would be
   // much slower.
-  bool InitFromDisk(const FilePath& history_name);
+  bool InitFromDisk(const base::FilePath& history_name);
 
  protected:
   // Implemented for URLDatabase.

chrome/browser/history/in_memory_history_backend.cc

@@ -27,7 +27,7 @@ InMemoryHistoryBackend::InMemoryHistoryBackend()
 
 InMemoryHistoryBackend::~InMemoryHistoryBackend() {}
 
-bool InMemoryHistoryBackend::Init(const FilePath& history_filename,
+bool InMemoryHistoryBackend::Init(const base::FilePath& history_filename,
                                   URLDatabase* db) {
   db_.reset(new InMemoryDatabase);
   return db_->InitFromDisk(history_filename);

chrome/browser/history/in_memory_history_backend.h

@@ -21,10 +21,13 @@
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
-class FilePath;
 class GURL;
 class Profile;
 
+namespace base {
+class FilePath;
+}
+
 namespace history {
 
 class InMemoryDatabase;
@@ -42,7 +45,7 @@ class InMemoryHistoryBackend : public content::NotificationObserver {
   // Initializes the backend from the history database pointed to by the
   // full path in |history_filename|. |db| is used for setting up the
   // InMemoryDatabase.
-  bool Init(const FilePath& history_filename, URLDatabase* db);
+  bool Init(const base::FilePath& history_filename, URLDatabase* db);
 
   // Does initialization work when this object is attached to the history
   // system on the main thread. The argument is the profile with which the

chrome/browser/history/thumbnail_database.h

@@ -15,11 +15,11 @@
 #include "sql/meta_table.h"
 #include "sql/statement.h"
 
-class FilePath;
 struct ThumbnailScore;
 class SkBitmap;
 
 namespace base {
+class FilePath;
 class RefCountedMemory;
 class Time;
 }
@@ -47,7 +47,7 @@ class ThumbnailDatabase {
 
   // Must be called after creation but before any other methods are called.
   // When not INIT_OK, no other functions should be called.
-  sql::InitStatus Init(const FilePath& db_name,
+  sql::InitStatus Init(const base::FilePath& db_name,
                        const HistoryPublisher* history_publisher,
                        URLDatabase* url_database);
 
@@ -56,7 +56,7 @@ class ThumbnailDatabase {
   // |db| is the database to open.
   // |db_name| is a path to the database file.
   static sql::InitStatus OpenDatabase(sql::Connection* db,
-                                      const FilePath& db_name);
+                                      const base::FilePath& db_name);
 
   // Transactions on the database.
   void BeginTransaction();
@@ -308,8 +308,8 @@ class ThumbnailDatabase {
   bool NeedsMigrationToTopSites();
 
   // Renames the database file and drops the Thumbnails table.
-  bool RenameAndDropThumbnails(const FilePath& old_db_file,
+  bool RenameAndDropThumbnails(const base::FilePath& old_db_file,
-                               const FilePath& new_db_file);
+                               const base::FilePath& new_db_file);
 
  private:
   friend class ExpireHistoryBackend;

chrome/browser/history/top_sites.h

@@ -29,10 +29,10 @@
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/image/image.h"
 
-class FilePath;
 class Profile;
 
 namespace base {
+class FilePath;
 class RefCountedBytes;
 class RefCountedMemory;
 }
@@ -57,7 +57,7 @@ class TopSites
   explicit TopSites(Profile* profile);
 
   // Initializes TopSites.
-  void Init(const FilePath& db_name);
+  void Init(const base::FilePath& db_name);
 
   // Sets the given thumbnail for the given URL. Returns true if the thumbnail
   // was updated. False means either the URL wasn't known to us, or we felt

chrome/browser/history/top_sites_backend.h

@@ -12,7 +12,10 @@
 #include "chrome/browser/history/history_types.h"
 
 class CancelableTaskTracker;
+
+namespace base {
 class FilePath;
+}
 
 namespace history {
 
@@ -31,7 +34,7 @@ class TopSitesBackend : public base::RefCountedThreadSafe<TopSitesBackend> {
 
   TopSitesBackend();
 
-  void Init(const FilePath& path);
+  void Init(const base::FilePath& path);
 
   // Schedules the db to be shutdown.
   void Shutdown();
@@ -64,7 +67,7 @@ class TopSitesBackend : public base::RefCountedThreadSafe<TopSitesBackend> {
   virtual ~TopSitesBackend();
 
   // Invokes Init on the db_.
-  void InitDBOnDBThread(const FilePath& path);
+  void InitDBOnDBThread(const base::FilePath& path);
 
   // Shuts down the db.
   void ShutdownDBOnDBThread();
@@ -83,9 +86,9 @@ class TopSitesBackend : public base::RefCountedThreadSafe<TopSitesBackend> {
                                   const Images& thumbnail);
 
   // Resets the database.
-  void ResetDatabaseOnDBThread(const FilePath& file_path);
+  void ResetDatabaseOnDBThread(const base::FilePath& file_path);
 
-  FilePath db_path_;
+  base::FilePath db_path_;
 
   scoped_ptr<TopSitesDatabase> db_;
 

chrome/browser/history/top_sites_database.h

@@ -13,7 +13,9 @@
 #include "chrome/browser/history/url_database.h"  // For DBCloseScoper.
 #include "sql/meta_table.h"
 
+namespace base {
 class FilePath;
+}
 
 namespace sql {
 class Connection;
@@ -28,7 +30,7 @@ class TopSitesDatabase {
 
   // Must be called after creation but before any other methods are called.
   // Returns true on success. If false, no other functions should be called.
-  bool Init(const FilePath& db_name);
+  bool Init(const base::FilePath& db_name);
 
   // Returns true if migration of top sites from history may be needed. A value
   // of true means either migration is definitely needed (the top sites file is
@@ -92,7 +94,7 @@ class TopSitesDatabase {
   // Returns the number of URLs (rows) in the database.
   int GetRowCount();
 
-  sql::Connection* CreateDB(const FilePath& db_name);
+  sql::Connection* CreateDB(const base::FilePath& db_name);
 
   // Encodes redirects into a string.
   static std::string GetRedirects(const MostVisitedURL& url);

chrome/browser/icon_manager.h

@@ -51,7 +51,9 @@
 #include "chrome/common/cancelable_task_tracker.h"
 #include "ui/gfx/image/image.h"
 
+namespace base {
 class FilePath;
+}
 
 class IconManager : public IconLoader::Delegate {
  public:
@@ -63,7 +65,7 @@ class IconManager : public IconLoader::Delegate {
   // it via 'LoadIcon'. The returned bitmap is owned by the IconManager and must
   // not be free'd by the caller. If the caller needs to modify the icon, it
   // must make a copy and modify the copy.
-  gfx::Image* LookupIcon(const FilePath& file_name, IconLoader::IconSize size);
+  gfx::Image* LookupIcon(const base::FilePath& file_name, IconLoader::IconSize size);
 
   typedef base::Callback<void(gfx::Image*)> IconRequestCallback;
 
@@ -77,7 +79,7 @@ class IconManager : public IconLoader::Delegate {
   //    should never keep it or delete it.
   // 3. The gfx::Image pointer passed to the callback may be NULL if decoding
   //    failed.
-  CancelableTaskTracker::TaskId LoadIcon(const FilePath& file_name,
+  CancelableTaskTracker::TaskId LoadIcon(const base::FilePath& file_name,
                                          IconLoader::IconSize size,
                                          const IconRequestCallback& callback,
                                          CancelableTaskTracker* tracker);
@@ -87,7 +89,7 @@ class IconManager : public IconLoader::Delegate {
 
   // Get the identifying string for the given file. The implementation
   // is in icon_manager_[platform].cc.
-  static IconGroupID GetGroupIDFromFilepath(const FilePath& path);
+  static IconGroupID GetGroupIDFromFilepath(const base::FilePath& path);
 
  private:
   struct CacheKey {

chrome/browser/icon_manager_android.cc

@@ -5,7 +5,7 @@
 #include "base/logging.h"
 #include "chrome/browser/icon_manager.h"
 
-IconGroupID IconManager::GetGroupIDFromFilepath(const FilePath& filepath) {
+IconGroupID IconManager::GetGroupIDFromFilepath(const base::FilePath& filepath) {
   NOTIMPLEMENTED();
   return 0;
 }

chrome/browser/icon_manager_linux.cc

@@ -7,7 +7,8 @@
 #include "base/nix/mime_util_xdg.h"
 #include "base/threading/thread_restrictions.h"
 
-IconGroupID IconManager::GetGroupIDFromFilepath(const FilePath& filepath) {
+IconGroupID IconManager::GetGroupIDFromFilepath(
+    const base::FilePath& filepath) {
   // It turns out the call to base::nix::GetFileMimeType below does IO, but
   // callers of GetGroupIDFromFilepath assume it does not do IO (the Windows
   // and Mac implementations do not). We should fix this by either not doing IO