| Index: webkit/chromeos/fileapi/memory_file_util.h
|
| diff --git a/webkit/chromeos/fileapi/memory_file_util.h b/webkit/chromeos/fileapi/memory_file_util.h
|
| index 723bada7c5780f0b87b8b52cb7249fa1e6cf18c3..adbdce6b8cc490e4260d912b36474087907570d8 100644
|
| --- a/webkit/chromeos/fileapi/memory_file_util.h
|
| +++ b/webkit/chromeos/fileapi/memory_file_util.h
|
| @@ -28,104 +28,104 @@ class MemoryFileUtil : public FileUtilAsync {
|
| base::Time last_modified;
|
| };
|
|
|
| - MemoryFileUtil(const FilePath& root_path);
|
| + MemoryFileUtil(const base::FilePath& root_path);
|
| virtual ~MemoryFileUtil();
|
|
|
| // FileUtilAsync overrides.
|
| - virtual void Open(const FilePath& file_path,
|
| + virtual void Open(const base::FilePath& file_path,
|
| int file_flags, // PlatformFileFlags
|
| const OpenCallback& callback) OVERRIDE;
|
| - virtual void GetFileInfo(const FilePath& file_path,
|
| + virtual void GetFileInfo(const base::FilePath& file_path,
|
| const GetFileInfoCallback& callback) OVERRIDE;
|
| - virtual void Create(const FilePath& file_path,
|
| + virtual void Create(const base::FilePath& file_path,
|
| const StatusCallback& callback) OVERRIDE;
|
| - virtual void Truncate(const FilePath& file_path,
|
| + virtual void Truncate(const base::FilePath& file_path,
|
| int64 length,
|
| const StatusCallback& callback) OVERRIDE;
|
| // This FS ignores last_access_time.
|
| - virtual void Touch(const FilePath& file_path,
|
| + virtual void Touch(const base::FilePath& file_path,
|
| const base::Time& last_access_time,
|
| const base::Time& last_modified_time,
|
| const StatusCallback& callback) OVERRIDE;
|
| - virtual void Remove(const FilePath& file_path,
|
| + virtual void Remove(const base::FilePath& file_path,
|
| bool recursive,
|
| const StatusCallback& callback) OVERRIDE;
|
| - virtual void CreateDirectory(const FilePath& dir_path,
|
| + virtual void CreateDirectory(const base::FilePath& dir_path,
|
| const StatusCallback& callback) OVERRIDE;
|
| - virtual void ReadDirectory(const FilePath& dir_path,
|
| + virtual void ReadDirectory(const base::FilePath& dir_path,
|
| const ReadDirectoryCallback& callback) OVERRIDE;
|
|
|
| private:
|
| friend class MemoryFileUtilTest;
|
|
|
| - typedef std::map<FilePath, FileEntry>::iterator FileIterator;
|
| - typedef std::map<FilePath, FileEntry>::const_iterator ConstFileIterator;
|
| + typedef std::map<base::FilePath, FileEntry>::iterator FileIterator;
|
| + typedef std::map<base::FilePath, FileEntry>::const_iterator ConstFileIterator;
|
|
|
| // Returns true if the given |file_path| is present in the file system.
|
| - bool FileExists(const FilePath& file_path) const {
|
| + bool FileExists(const base::FilePath& file_path) const {
|
| return files_.find(file_path) != files_.end();
|
| }
|
|
|
| // Returns true if the given |file_path| is present and a directory.
|
| - bool IsDirectory(const FilePath& file_path) const {
|
| + bool IsDirectory(const base::FilePath& file_path) const {
|
| ConstFileIterator it = files_.find(file_path);
|
| return it != files_.end() && it->second.is_directory;
|
| }
|
|
|
| // Callback function used to implement GetFileInfo().
|
| - void DoGetFileInfo(const FilePath& file_path,
|
| + void DoGetFileInfo(const base::FilePath& file_path,
|
| const GetFileInfoCallback& callback);
|
|
|
| // Callback function used to implement Create().
|
| - void DoCreate(const FilePath& file_path,
|
| + void DoCreate(const base::FilePath& file_path,
|
| bool is_directory,
|
| const StatusCallback& callback);
|
|
|
| // Callback function used to implement Truncate().
|
| - void DoTruncate(const FilePath& file_path,
|
| + void DoTruncate(const base::FilePath& file_path,
|
| int64 length,
|
| const StatusCallback& callback);
|
|
|
| // Callback function used to implement Touch().
|
| - void DoTouch(const FilePath& file_path,
|
| + void DoTouch(const base::FilePath& file_path,
|
| const base::Time& last_modified_time,
|
| const StatusCallback& callback);
|
|
|
| // Callback function used to implement Remove().
|
| - void DoRemoveSingleFile(const FilePath& file_path,
|
| + void DoRemoveSingleFile(const base::FilePath& file_path,
|
| const StatusCallback& callback);
|
|
|
| // Callback function used to implement Remove().
|
| - void DoRemoveRecursive(const FilePath& file_path,
|
| + void DoRemoveRecursive(const base::FilePath& file_path,
|
| const StatusCallback& callback);
|
|
|
| // Will start enumerating with file path |from|. If |from| path is
|
| // empty, will start from the beginning.
|
| - void DoReadDirectory(const FilePath& dir_path,
|
| - const FilePath& from,
|
| + void DoReadDirectory(const base::FilePath& dir_path,
|
| + const base::FilePath& from,
|
| const ReadDirectoryCallback& callback);
|
|
|
| // Opens a file of the given |file_path| with |flags|. A file is
|
| // guaranteed to be present at |file_path|.
|
| - void OpenVerifiedFile(const FilePath& file_path,
|
| + void OpenVerifiedFile(const base::FilePath& file_path,
|
| int flags,
|
| const OpenCallback& callback);
|
|
|
| // Callback function used to implement Open().
|
| - void DidGetFileInfoForOpen(const FilePath& file_path,
|
| + void DidGetFileInfoForOpen(const base::FilePath& file_path,
|
| int flags,
|
| const OpenCallback& callback,
|
| PlatformFileError get_info_result,
|
| const base::PlatformFileInfo& file_info);
|
|
|
| // Callback function used to implement Open().
|
| - void OpenTruncatedFileOrCreate(const FilePath& file_path,
|
| + void OpenTruncatedFileOrCreate(const base::FilePath& file_path,
|
| int flags,
|
| const OpenCallback& callback,
|
| PlatformFileError result);
|
|
|
| // Callback function used to implement Open().
|
| - void DidCreateOrTruncateForOpen(const FilePath& file_path,
|
| + void DidCreateOrTruncateForOpen(const base::FilePath& file_path,
|
| int flags,
|
| int64 size,
|
| const OpenCallback& callback,
|
| @@ -138,7 +138,7 @@ class MemoryFileUtil : public FileUtilAsync {
|
| }
|
|
|
| // The files in the file system.
|
| - std::map<FilePath, FileEntry> files_;
|
| + std::map<base::FilePath, FileEntry> files_;
|
| size_t read_directory_buffer_size_;
|
| std::vector<DirectoryEntry> read_directory_buffer_;
|
|
|
|
|