| Index: webkit/fileapi/mount_points.h
|
| diff --git a/webkit/fileapi/mount_points.h b/webkit/fileapi/mount_points.h
|
| index 27df0f279ab17cf9410dae2a0bd650882f7ecdab..30779bbf09052704aaa15e35d3c17c964d534a4d 100644
|
| --- a/webkit/fileapi/mount_points.h
|
| +++ b/webkit/fileapi/mount_points.h
|
| @@ -26,7 +26,7 @@ class WEBKIT_STORAGE_EXPORT MountPoints {
|
| public:
|
| struct WEBKIT_STORAGE_EXPORT MountPointInfo {
|
| MountPointInfo();
|
| - MountPointInfo(const std::string& name, const FilePath& path);
|
| + MountPointInfo(const std::string& name, const base::FilePath& path);
|
|
|
| // The name to be used to register the path. The registered file can
|
| // be referred by a virtual path /<filesystem_id>/<name>.
|
| @@ -34,7 +34,7 @@ class WEBKIT_STORAGE_EXPORT MountPoints {
|
| std::string name;
|
|
|
| // The path of the file.
|
| - FilePath path;
|
| + base::FilePath path;
|
|
|
| // For STL operation.
|
| bool operator<(const MountPointInfo& that) const {
|
| @@ -65,12 +65,12 @@ class WEBKIT_STORAGE_EXPORT MountPoints {
|
| virtual FileSystemURL CreateCrackedFileSystemURL(
|
| const GURL& origin,
|
| fileapi::FileSystemType type,
|
| - const FilePath& path) const = 0;
|
| + const base::FilePath& path) const = 0;
|
|
|
| // Returns the mount point root path registered for a given |mount_name|.
|
| // Returns false if the given |mount_name| is not valid.
|
| virtual bool GetRegisteredPath(const std::string& mount_name,
|
| - FilePath* path) const = 0;
|
| + base::FilePath* path) const = 0;
|
|
|
| // Cracks the given |virtual_path| (which is the path part of a filesystem URL
|
| // without '/external' or '/isolated' prefix part) and populates the
|
| @@ -83,10 +83,10 @@ class WEBKIT_STORAGE_EXPORT MountPoints {
|
| // Note that |path| is set to empty paths if the filesystem type is isolated
|
| // and |virtual_path| has no <relative_path> part (i.e. pointing to the
|
| // virtual root).
|
| - virtual bool CrackVirtualPath(const FilePath& virtual_path,
|
| + virtual bool CrackVirtualPath(const base::FilePath& virtual_path,
|
| std::string* mount_name,
|
| FileSystemType* type,
|
| - FilePath* path) const = 0;
|
| + base::FilePath* path) const = 0;
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(MountPoints);
|
|
|