Index: chrome/browser/media_galleries/fileapi/media_file_validator_factory.cc |
diff --git a/chrome/browser/media_galleries/fileapi/media_file_validator_factory.cc b/chrome/browser/media_galleries/fileapi/media_file_validator_factory.cc |
index 480dd64d34e19b183d317d4ce9f42f3e195b1d54..266a40baefd30017cfc49aab6b864130baf74338 100644 |
--- a/chrome/browser/media_galleries/fileapi/media_file_validator_factory.cc |
+++ b/chrome/browser/media_galleries/fileapi/media_file_validator_factory.cc |
@@ -7,24 +7,24 @@ |
#include "base/files/file_path.h" |
#include "chrome/browser/media_galleries/fileapi/supported_audio_video_checker.h" |
#include "chrome/browser/media_galleries/fileapi/supported_image_type_validator.h" |
-#include "webkit/browser/fileapi/copy_or_move_file_validator.h" |
-#include "webkit/browser/fileapi/file_system_url.h" |
+#include "storage/browser/fileapi/copy_or_move_file_validator.h" |
+#include "storage/browser/fileapi/file_system_url.h" |
namespace { |
-class InvalidFileValidator : public fileapi::CopyOrMoveFileValidator { |
+class InvalidFileValidator : public storage::CopyOrMoveFileValidator { |
public: |
virtual ~InvalidFileValidator() {} |
virtual void StartPreWriteValidation( |
- const fileapi::CopyOrMoveFileValidator::ResultCallback& |
- result_callback) OVERRIDE { |
+ const storage::CopyOrMoveFileValidator::ResultCallback& result_callback) |
+ OVERRIDE { |
result_callback.Run(base::File::FILE_ERROR_SECURITY); |
} |
virtual void StartPostWriteValidation( |
const base::FilePath& dest_platform_path, |
- const fileapi::CopyOrMoveFileValidator::ResultCallback& |
- result_callback) OVERRIDE { |
+ const storage::CopyOrMoveFileValidator::ResultCallback& result_callback) |
+ OVERRIDE { |
result_callback.Run(base::File::FILE_ERROR_SECURITY); |
} |
@@ -41,9 +41,9 @@ class InvalidFileValidator : public fileapi::CopyOrMoveFileValidator { |
MediaFileValidatorFactory::MediaFileValidatorFactory() {} |
MediaFileValidatorFactory::~MediaFileValidatorFactory() {} |
-fileapi::CopyOrMoveFileValidator* |
+storage::CopyOrMoveFileValidator* |
MediaFileValidatorFactory::CreateCopyOrMoveFileValidator( |
- const fileapi::FileSystemURL& src, |
+ const storage::FileSystemURL& src, |
const base::FilePath& platform_path) { |
base::FilePath src_path = src.virtual_path(); |
if (SupportedImageTypeValidator::SupportsFileType(src_path)) |