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

chrome/browser/media_galleries/fileapi/iphoto_file_util.h

Index: chrome/browser/media_galleries/fileapi/iphoto_file_util.h
diff --git a/chrome/browser/media_galleries/fileapi/iphoto_file_util.h b/chrome/browser/media_galleries/fileapi/iphoto_file_util.h
index 421373ffa523829fd0ebb380c6c17d0cf4481a81..ad5a8c39165e2391d1bd6d828acb4243c694a5bb 100644
--- a/chrome/browser/media_galleries/fileapi/iphoto_file_util.h
+++ b/chrome/browser/media_galleries/fileapi/iphoto_file_util.h
@@ -37,51 +37,51 @@ class IPhotoFileUtil : public NativeMediaFileUtil {
  protected:
   // NativeMediaFileUtil overrides.
   virtual void GetFileInfoOnTaskRunnerThread(
-      scoped_ptr<fileapi::FileSystemOperationContext> context,
-      const fileapi::FileSystemURL& url,
+      scoped_ptr<storage::FileSystemOperationContext> context,
+      const storage::FileSystemURL& url,
       const GetFileInfoCallback& callback) OVERRIDE;
   virtual void ReadDirectoryOnTaskRunnerThread(
-      scoped_ptr<fileapi::FileSystemOperationContext> context,
-      const fileapi::FileSystemURL& url,
+      scoped_ptr<storage::FileSystemOperationContext> context,
+      const storage::FileSystemURL& url,
       const ReadDirectoryCallback& callback) OVERRIDE;
   virtual void CreateSnapshotFileOnTaskRunnerThread(
-      scoped_ptr<fileapi::FileSystemOperationContext> context,
-      const fileapi::FileSystemURL& url,
+      scoped_ptr<storage::FileSystemOperationContext> context,
+      const storage::FileSystemURL& url,
       const CreateSnapshotFileCallback& callback) OVERRIDE;
   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) OVERRIDE;
   virtual base::File::Error ReadDirectorySync(
-      fileapi::FileSystemOperationContext* context,
-      const fileapi::FileSystemURL& url,
+      storage::FileSystemOperationContext* context,
+      const storage::FileSystemURL& url,
       EntryList* file_list) OVERRIDE;
   virtual base::File::Error DeleteDirectorySync(
-      fileapi::FileSystemOperationContext* context,
-      const fileapi::FileSystemURL& url) OVERRIDE;
+      storage::FileSystemOperationContext* context,
+      const storage::FileSystemURL& url) OVERRIDE;
   virtual base::File::Error DeleteFileSync(
-      fileapi::FileSystemOperationContext* context,
-      const fileapi::FileSystemURL& url) OVERRIDE;
+      storage::FileSystemOperationContext* context,
+      const storage::FileSystemURL& url) OVERRIDE;
   virtual base::File::Error GetLocalFilePath(
-      fileapi::FileSystemOperationContext* context,
-      const fileapi::FileSystemURL& url,
+      storage::FileSystemOperationContext* context,
+      const storage::FileSystemURL& url,
       base::FilePath* local_file_path) OVERRIDE;
 
  private:
   void GetFileInfoWithFreshDataProvider(
-      scoped_ptr<fileapi::FileSystemOperationContext> context,
-      const fileapi::FileSystemURL& url,
+      scoped_ptr<storage::FileSystemOperationContext> context,
+      const storage::FileSystemURL& url,
       const GetFileInfoCallback& callback,
       bool valid_parse);
   void ReadDirectoryWithFreshDataProvider(
-      scoped_ptr<fileapi::FileSystemOperationContext> context,
-      const fileapi::FileSystemURL& url,
+      scoped_ptr<storage::FileSystemOperationContext> context,
+      const storage::FileSystemURL& url,
       const ReadDirectoryCallback& callback,
       bool valid_parse);
   virtual void CreateSnapshotFileWithFreshDataProvider(
-      scoped_ptr<fileapi::FileSystemOperationContext> context,
-      const fileapi::FileSystemURL& url,
+      scoped_ptr<storage::FileSystemOperationContext> context,
+      const storage::FileSystemURL& url,
       const CreateSnapshotFileCallback& callback,
       bool valid_parse);