Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single sto…

chrome/browser/media_galleries/fileapi/media_file_validator_factory.cc

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..df629ad118eb343be650cfc85f062d68a8dbb201 100644
--- a/chrome/browser/media_galleries/fileapi/media_file_validator_factory.cc
+++ b/chrome/browser/media_galleries/fileapi/media_file_validator_factory.cc
@@ -12,19 +12,19 @@
 
 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))