| Index: webkit/fileapi/obfuscated_file_util.h
|
| diff --git a/webkit/fileapi/obfuscated_file_util.h b/webkit/fileapi/obfuscated_file_util.h
|
| index 88fc4417da8a73238592ab7e0cc609093eafea8f..f9d770bbdd306d782b5ab4c75797b4ec41da3857 100644
|
| --- a/webkit/fileapi/obfuscated_file_util.h
|
| +++ b/webkit/fileapi/obfuscated_file_util.h
|
| @@ -55,7 +55,7 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE ObfuscatedFileUtil
|
| virtual bool HasFileSystemType(FileSystemType type) const = 0;
|
| };
|
|
|
| - explicit ObfuscatedFileUtil(const FilePath& file_system_directory);
|
| + explicit ObfuscatedFileUtil(const base::FilePath& file_system_directory);
|
| virtual ~ObfuscatedFileUtil();
|
|
|
| // FileSystemFileUtil overrides.
|
| @@ -80,7 +80,7 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE ObfuscatedFileUtil
|
| FileSystemOperationContext* context,
|
| const FileSystemURL& url,
|
| base::PlatformFileInfo* file_info,
|
| - FilePath* platform_file) OVERRIDE;
|
| + base::FilePath* platform_file) OVERRIDE;
|
| virtual scoped_ptr<AbstractFileEnumerator> CreateFileEnumerator(
|
| FileSystemOperationContext* context,
|
| const FileSystemURL& root_url,
|
| @@ -88,7 +88,7 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE ObfuscatedFileUtil
|
| virtual base::PlatformFileError GetLocalFilePath(
|
| FileSystemOperationContext* context,
|
| const FileSystemURL& file_system_url,
|
| - FilePath* local_path) OVERRIDE;
|
| + base::FilePath* local_path) OVERRIDE;
|
| virtual base::PlatformFileError Touch(
|
| FileSystemOperationContext* context,
|
| const FileSystemURL& url,
|
| @@ -105,7 +105,7 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE ObfuscatedFileUtil
|
| bool copy) OVERRIDE;
|
| virtual base::PlatformFileError CopyInForeignFile(
|
| FileSystemOperationContext* context,
|
| - const FilePath& src_file_path,
|
| + const base::FilePath& src_file_path,
|
| const FileSystemURL& dest_url) OVERRIDE;
|
| virtual base::PlatformFileError DeleteFile(
|
| FileSystemOperationContext* context,
|
| @@ -117,7 +117,7 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE ObfuscatedFileUtil
|
| FileSystemOperationContext* context,
|
| const FileSystemURL& url,
|
| base::PlatformFileInfo* file_info,
|
| - FilePath* platform_path,
|
| + base::FilePath* platform_path,
|
| SnapshotFilePolicy* policy) OVERRIDE;
|
|
|
| // Returns true if the directory |url| is empty.
|
| @@ -133,7 +133,7 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE ObfuscatedFileUtil
|
| // there is a file system error (e.g. the directory doesn't exist on disk and
|
| // |create| is false). Callers should always check |error_code| to make sure
|
| // the returned path is usable.
|
| - FilePath GetDirectoryForOriginAndType(
|
| + base::FilePath GetDirectoryForOriginAndType(
|
| const GURL& origin,
|
| FileSystemType type,
|
| bool create,
|
| @@ -146,7 +146,7 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE ObfuscatedFileUtil
|
| // TODO(ericu): This doesn't really feel like it belongs in this class.
|
| // The previous version lives in FileSystemPathManager, but perhaps
|
| // SandboxMountPointProvider would be better?
|
| - static FilePath::StringType GetDirectoryNameForType(FileSystemType type);
|
| + static base::FilePath::StringType GetDirectoryNameForType(FileSystemType type);
|
|
|
| // This method and all methods of its returned class must be called only on
|
| // the FILE thread. The caller is responsible for deleting the returned
|
| @@ -162,7 +162,7 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE ObfuscatedFileUtil
|
| // this ignores all but the BaseName of the supplied path. In order to
|
| // compute the cost of adding a multi-segment directory recursively, call this
|
| // on each path segment and add the results.
|
| - static int64 ComputeFilePathCost(const FilePath& path);
|
| + static int64 ComputeFilePathCost(const base::FilePath& path);
|
|
|
| private:
|
| typedef FileSystemDirectoryDatabase::FileId FileId;
|
| @@ -178,7 +178,7 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE ObfuscatedFileUtil
|
| FileId file_id,
|
| FileInfo* local_info,
|
| base::PlatformFileInfo* file_info,
|
| - FilePath* platform_file_path);
|
| + base::FilePath* platform_file_path);
|
|
|
| // Creates a new file, both the underlying backing file and the entry in the
|
| // database. |dest_file_info| is an in-out parameter. Supply the name and
|
| @@ -193,7 +193,7 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE ObfuscatedFileUtil
|
| // DCHECK and handle will hold base::kInvalidPlatformFileValue.
|
| base::PlatformFileError CreateFile(
|
| FileSystemOperationContext* context,
|
| - const FilePath& source_file_path,
|
| + const base::FilePath& source_file_path,
|
| const GURL& dest_origin,
|
| FileSystemType dest_type,
|
| FileInfo* dest_file_info,
|
| @@ -203,10 +203,10 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE ObfuscatedFileUtil
|
| // This converts from a relative path [as is stored in the FileInfo.data_path
|
| // field] to an absolute platform path that can be given to the native
|
| // filesystem.
|
| - FilePath DataPathToLocalPath(
|
| + base::FilePath DataPathToLocalPath(
|
| const GURL& origin,
|
| FileSystemType type,
|
| - const FilePath& data_file_path);
|
| + const base::FilePath& data_file_path);
|
|
|
| // This returns NULL if |create| flag is false and a filesystem does not
|
| // exist for the given |origin_url| and |type|.
|
| @@ -216,7 +216,7 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE ObfuscatedFileUtil
|
|
|
| // Gets the topmost directory specific to this origin. This will
|
| // contain both the filesystem type subdirectories.
|
| - FilePath GetDirectoryForOrigin(const GURL& origin,
|
| + base::FilePath GetDirectoryForOrigin(const GURL& origin,
|
| bool create,
|
| base::PlatformFileError* error_code);
|
|
|
| @@ -233,12 +233,12 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE ObfuscatedFileUtil
|
| FileSystemOperationContext* context,
|
| const GURL& origin,
|
| FileSystemType type,
|
| - FilePath* local_path);
|
| + base::FilePath* local_path);
|
|
|
| typedef std::map<std::string, FileSystemDirectoryDatabase*> DirectoryMap;
|
| DirectoryMap directories_;
|
| scoped_ptr<FileSystemOriginDatabase> origin_database_;
|
| - FilePath file_system_directory_;
|
| + base::FilePath file_system_directory_;
|
| base::OneShotTimer<ObfuscatedFileUtil> timer_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ObfuscatedFileUtil);
|
|
|