Index: chrome/browser/media_galleries/fileapi/native_media_file_util.h |
diff --git a/chrome/browser/media_galleries/fileapi/native_media_file_util.h b/chrome/browser/media_galleries/fileapi/native_media_file_util.h |
index 0329be5570bf194a2724fbab3ca47122ba78c922..8f5b570949431996345da002184d6e294afbe0bf 100644 |
--- a/chrome/browser/media_galleries/fileapi/native_media_file_util.h |
+++ b/chrome/browser/media_galleries/fileapi/native_media_file_util.h |
@@ -7,7 +7,7 @@ |
#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
-#include "webkit/browser/fileapi/async_file_util.h" |
+#include "storage/browser/fileapi/async_file_util.h" |
namespace net { |
class IOBuffer; |
@@ -18,7 +18,7 @@ class MediaPathFilter; |
// This class handles native file system operations with media type filtering. |
// To support virtual file systems it implements the AsyncFileUtil interface |
// from scratch and provides synchronous override points. |
-class NativeMediaFileUtil : public fileapi::AsyncFileUtil { |
+class NativeMediaFileUtil : public storage::AsyncFileUtil { |
public: |
explicit NativeMediaFileUtil(MediaPathFilter* media_path_filter); |
virtual ~NativeMediaFileUtil(); |
@@ -35,168 +35,166 @@ class NativeMediaFileUtil : public fileapi::AsyncFileUtil { |
static void CreatedSnapshotFileForCreateOrOpen( |
base::SequencedTaskRunner* media_task_runner, |
int file_flags, |
- const fileapi::AsyncFileUtil::CreateOrOpenCallback& callback, |
+ const storage::AsyncFileUtil::CreateOrOpenCallback& callback, |
base::File::Error result, |
const base::File::Info& file_info, |
const base::FilePath& platform_path, |
- const scoped_refptr<webkit_blob::ShareableFileReference>& file_ref); |
+ const scoped_refptr<storage::ShareableFileReference>& file_ref); |
// AsyncFileUtil overrides. |
virtual void CreateOrOpen( |
- scoped_ptr<fileapi::FileSystemOperationContext> context, |
- const fileapi::FileSystemURL& url, |
+ scoped_ptr<storage::FileSystemOperationContext> context, |
+ const storage::FileSystemURL& url, |
int file_flags, |
const CreateOrOpenCallback& callback) OVERRIDE; |
virtual void EnsureFileExists( |
- scoped_ptr<fileapi::FileSystemOperationContext> context, |
- const fileapi::FileSystemURL& url, |
+ scoped_ptr<storage::FileSystemOperationContext> context, |
+ const storage::FileSystemURL& url, |
const EnsureFileExistsCallback& callback) OVERRIDE; |
virtual void CreateDirectory( |
- scoped_ptr<fileapi::FileSystemOperationContext> context, |
- const fileapi::FileSystemURL& url, |
+ scoped_ptr<storage::FileSystemOperationContext> context, |
+ const storage::FileSystemURL& url, |
bool exclusive, |
bool recursive, |
const StatusCallback& callback) OVERRIDE; |
virtual void GetFileInfo( |
- scoped_ptr<fileapi::FileSystemOperationContext> context, |
- const fileapi::FileSystemURL& url, |
+ scoped_ptr<storage::FileSystemOperationContext> context, |
+ const storage::FileSystemURL& url, |
const GetFileInfoCallback& callback) OVERRIDE; |
virtual void ReadDirectory( |
- scoped_ptr<fileapi::FileSystemOperationContext> context, |
- const fileapi::FileSystemURL& url, |
+ scoped_ptr<storage::FileSystemOperationContext> context, |
+ const storage::FileSystemURL& url, |
const ReadDirectoryCallback& callback) OVERRIDE; |
- virtual void Touch( |
- scoped_ptr<fileapi::FileSystemOperationContext> context, |
- const fileapi::FileSystemURL& url, |
- const base::Time& last_access_time, |
- const base::Time& last_modified_time, |
- const StatusCallback& callback) OVERRIDE; |
- virtual void Truncate( |
- scoped_ptr<fileapi::FileSystemOperationContext> context, |
- const fileapi::FileSystemURL& url, |
- int64 length, |
- const StatusCallback& callback) OVERRIDE; |
+ virtual void Touch(scoped_ptr<storage::FileSystemOperationContext> context, |
+ const storage::FileSystemURL& url, |
+ const base::Time& last_access_time, |
+ const base::Time& last_modified_time, |
+ const StatusCallback& callback) OVERRIDE; |
+ virtual void Truncate(scoped_ptr<storage::FileSystemOperationContext> context, |
+ const storage::FileSystemURL& url, |
+ int64 length, |
+ const StatusCallback& callback) OVERRIDE; |
virtual void CopyFileLocal( |
- scoped_ptr<fileapi::FileSystemOperationContext> context, |
- const fileapi::FileSystemURL& src_url, |
- const fileapi::FileSystemURL& dest_url, |
+ scoped_ptr<storage::FileSystemOperationContext> context, |
+ const storage::FileSystemURL& src_url, |
+ const storage::FileSystemURL& dest_url, |
CopyOrMoveOption option, |
const CopyFileProgressCallback& progress_callback, |
const StatusCallback& callback) OVERRIDE; |
virtual void MoveFileLocal( |
- scoped_ptr<fileapi::FileSystemOperationContext> context, |
- const fileapi::FileSystemURL& src_url, |
- const fileapi::FileSystemURL& dest_url, |
+ scoped_ptr<storage::FileSystemOperationContext> context, |
+ const storage::FileSystemURL& src_url, |
+ const storage::FileSystemURL& dest_url, |
CopyOrMoveOption option, |
const StatusCallback& callback) OVERRIDE; |
virtual void CopyInForeignFile( |
- scoped_ptr<fileapi::FileSystemOperationContext> context, |
+ scoped_ptr<storage::FileSystemOperationContext> context, |
const base::FilePath& src_file_path, |
- const fileapi::FileSystemURL& dest_url, |
+ const storage::FileSystemURL& dest_url, |
const StatusCallback& callback) OVERRIDE; |
virtual void DeleteFile( |
- scoped_ptr<fileapi::FileSystemOperationContext> context, |
- const fileapi::FileSystemURL& url, |
+ scoped_ptr<storage::FileSystemOperationContext> context, |
+ const storage::FileSystemURL& url, |
const StatusCallback& callback) OVERRIDE; |
virtual void DeleteDirectory( |
- scoped_ptr<fileapi::FileSystemOperationContext> context, |
- const fileapi::FileSystemURL& url, |
+ scoped_ptr<storage::FileSystemOperationContext> context, |
+ const storage::FileSystemURL& url, |
const StatusCallback& callback) OVERRIDE; |
virtual void DeleteRecursively( |
- scoped_ptr<fileapi::FileSystemOperationContext> context, |
- const fileapi::FileSystemURL& url, |
+ scoped_ptr<storage::FileSystemOperationContext> context, |
+ const storage::FileSystemURL& url, |
const StatusCallback& callback) OVERRIDE; |
virtual void CreateSnapshotFile( |
- scoped_ptr<fileapi::FileSystemOperationContext> context, |
- const fileapi::FileSystemURL& url, |
+ scoped_ptr<storage::FileSystemOperationContext> context, |
+ const storage::FileSystemURL& url, |
const CreateSnapshotFileCallback& callback) OVERRIDE; |
protected: |
virtual void CreateDirectoryOnTaskRunnerThread( |
- scoped_ptr<fileapi::FileSystemOperationContext> context, |
- const fileapi::FileSystemURL& url, |
+ scoped_ptr<storage::FileSystemOperationContext> context, |
+ const storage::FileSystemURL& url, |
bool exclusive, |
bool recursive, |
const StatusCallback& callback); |
virtual void GetFileInfoOnTaskRunnerThread( |
- scoped_ptr<fileapi::FileSystemOperationContext> context, |
- const fileapi::FileSystemURL& url, |
+ scoped_ptr<storage::FileSystemOperationContext> context, |
+ const storage::FileSystemURL& url, |
const GetFileInfoCallback& callback); |
virtual void ReadDirectoryOnTaskRunnerThread( |
- scoped_ptr<fileapi::FileSystemOperationContext> context, |
- const fileapi::FileSystemURL& url, |
+ scoped_ptr<storage::FileSystemOperationContext> context, |
+ const storage::FileSystemURL& url, |
const ReadDirectoryCallback& callback); |
virtual void CopyOrMoveFileLocalOnTaskRunnerThread( |
- scoped_ptr<fileapi::FileSystemOperationContext> context, |
- const fileapi::FileSystemURL& src_url, |
- const fileapi::FileSystemURL& dest_url, |
+ scoped_ptr<storage::FileSystemOperationContext> context, |
+ const storage::FileSystemURL& src_url, |
+ const storage::FileSystemURL& dest_url, |
CopyOrMoveOption option, |
bool copy, |
const StatusCallback& callback); |
virtual void CopyInForeignFileOnTaskRunnerThread( |
- scoped_ptr<fileapi::FileSystemOperationContext> context, |
+ scoped_ptr<storage::FileSystemOperationContext> context, |
const base::FilePath& src_file_path, |
- const fileapi::FileSystemURL& dest_url, |
+ const storage::FileSystemURL& dest_url, |
const StatusCallback& callback); |
virtual void DeleteFileOnTaskRunnerThread( |
- scoped_ptr<fileapi::FileSystemOperationContext> context, |
- const fileapi::FileSystemURL& url, |
+ scoped_ptr<storage::FileSystemOperationContext> context, |
+ const storage::FileSystemURL& url, |
const StatusCallback& callback); |
virtual void DeleteDirectoryOnTaskRunnerThread( |
- scoped_ptr<fileapi::FileSystemOperationContext> context, |
- const fileapi::FileSystemURL& url, |
+ scoped_ptr<storage::FileSystemOperationContext> context, |
+ const storage::FileSystemURL& url, |
const StatusCallback& callback); |
virtual void CreateSnapshotFileOnTaskRunnerThread( |
- scoped_ptr<fileapi::FileSystemOperationContext> context, |
- const fileapi::FileSystemURL& url, |
+ scoped_ptr<storage::FileSystemOperationContext> context, |
+ const storage::FileSystemURL& url, |
const CreateSnapshotFileCallback& callback); |
// The following methods should only be called on the task runner thread. |
// Necessary for copy/move to succeed. |
virtual base::File::Error CreateDirectorySync( |
- fileapi::FileSystemOperationContext* context, |
- const fileapi::FileSystemURL& url, |
+ storage::FileSystemOperationContext* context, |
+ const storage::FileSystemURL& url, |
bool exclusive, |
bool recursive); |
virtual base::File::Error CopyOrMoveFileSync( |
- fileapi::FileSystemOperationContext* context, |
- const fileapi::FileSystemURL& src_url, |
- const fileapi::FileSystemURL& dest_url, |
+ storage::FileSystemOperationContext* context, |
+ const storage::FileSystemURL& src_url, |
+ const storage::FileSystemURL& dest_url, |
CopyOrMoveOption option, |
bool copy); |
virtual base::File::Error CopyInForeignFileSync( |
- fileapi::FileSystemOperationContext* context, |
+ storage::FileSystemOperationContext* context, |
const base::FilePath& src_file_path, |
- const fileapi::FileSystemURL& dest_url); |
+ const storage::FileSystemURL& dest_url); |
virtual base::File::Error GetFileInfoSync( |
- fileapi::FileSystemOperationContext* context, |
- const fileapi::FileSystemURL& url, |
+ storage::FileSystemOperationContext* context, |
+ const storage::FileSystemURL& url, |
base::File::Info* file_info, |
base::FilePath* platform_path); |
// Called by GetFileInfoSync. Meant to be overridden by subclasses that |
// have special mappings from URLs to platform paths (virtual filesystems). |
virtual base::File::Error GetLocalFilePath( |
- fileapi::FileSystemOperationContext* context, |
- const fileapi::FileSystemURL& file_system_url, |
+ storage::FileSystemOperationContext* context, |
+ const storage::FileSystemURL& file_system_url, |
base::FilePath* local_file_path); |
virtual base::File::Error ReadDirectorySync( |
- fileapi::FileSystemOperationContext* context, |
- const fileapi::FileSystemURL& url, |
+ storage::FileSystemOperationContext* context, |
+ const storage::FileSystemURL& url, |
EntryList* file_list); |
virtual base::File::Error DeleteFileSync( |
- fileapi::FileSystemOperationContext* context, |
- const fileapi::FileSystemURL& url); |
+ storage::FileSystemOperationContext* context, |
+ const storage::FileSystemURL& url); |
// Necessary for move to succeed. |
virtual base::File::Error DeleteDirectorySync( |
- fileapi::FileSystemOperationContext* context, |
- const fileapi::FileSystemURL& url); |
+ storage::FileSystemOperationContext* context, |
+ const storage::FileSystemURL& url); |
virtual base::File::Error CreateSnapshotFileSync( |
- fileapi::FileSystemOperationContext* context, |
- const fileapi::FileSystemURL& url, |
+ storage::FileSystemOperationContext* context, |
+ const storage::FileSystemURL& url, |
base::File::Info* file_info, |
base::FilePath* platform_path, |
- scoped_refptr<webkit_blob::ShareableFileReference>* file_ref); |
+ scoped_refptr<storage::ShareableFileReference>* file_ref); |
MediaPathFilter* media_path_filter() { |
return media_path_filter_; |
@@ -207,8 +205,8 @@ class NativeMediaFileUtil : public fileapi::AsyncFileUtil { |
// consideration. If the media_path_filter() check fails, return |
// Fila::FILE_ERROR_SECURITY. |local_file_path| does not have to exist. |
base::File::Error GetFilteredLocalFilePath( |
- fileapi::FileSystemOperationContext* context, |
- const fileapi::FileSystemURL& file_system_url, |
+ storage::FileSystemOperationContext* context, |
+ const storage::FileSystemURL& file_system_url, |
base::FilePath* local_file_path); |
// Like GetLocalFilePath(), but if the file does not exist, then return |
@@ -218,12 +216,11 @@ class NativeMediaFileUtil : public fileapi::AsyncFileUtil { |
// If the media_path_filter() check fails, return |failure_error|. |
// If |local_file_path| is a directory, return File::FILE_OK. |
base::File::Error GetFilteredLocalFilePathForExistingFileOrDirectory( |
- fileapi::FileSystemOperationContext* context, |
- const fileapi::FileSystemURL& file_system_url, |
+ storage::FileSystemOperationContext* context, |
+ const storage::FileSystemURL& file_system_url, |
base::File::Error failure_error, |
base::FilePath* local_file_path); |
- |
// Not owned, owned by the backend which owns this. |
MediaPathFilter* const media_path_filter_; |