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

chrome/browser/chromeos/file_system_provider/provided_file_system.h

Index: chrome/browser/chromeos/file_system_provider/provided_file_system.h
diff --git a/chrome/browser/chromeos/file_system_provider/provided_file_system.h b/chrome/browser/chromeos/file_system_provider/provided_file_system.h
index b2fc735000e6e2a531695332f4d9f27aa0302ae8..7b7105bad5f30b09b563e25146e04a03b4c0cad7 100644
--- a/chrome/browser/chromeos/file_system_provider/provided_file_system.h
+++ b/chrome/browser/chromeos/file_system_provider/provided_file_system.h
@@ -40,19 +40,19 @@ class ProvidedFileSystem : public ProvidedFileSystemInterface {
 
   // ProvidedFileSystemInterface overrides.
   virtual AbortCallback RequestUnmount(
-      const fileapi::AsyncFileUtil::StatusCallback& callback) OVERRIDE;
+      const storage::AsyncFileUtil::StatusCallback& callback) OVERRIDE;
   virtual AbortCallback GetMetadata(
       const base::FilePath& entry_path,
       const GetMetadataCallback& callback) OVERRIDE;
   virtual AbortCallback ReadDirectory(
       const base::FilePath& directory_path,
-      const fileapi::AsyncFileUtil::ReadDirectoryCallback& callback) OVERRIDE;
+      const storage::AsyncFileUtil::ReadDirectoryCallback& callback) OVERRIDE;
   virtual AbortCallback OpenFile(const base::FilePath& file_path,
                                  OpenFileMode mode,
                                  const OpenFileCallback& callback) OVERRIDE;
   virtual AbortCallback CloseFile(
       int file_handle,
-      const fileapi::AsyncFileUtil::StatusCallback& callback) OVERRIDE;
+      const storage::AsyncFileUtil::StatusCallback& callback) OVERRIDE;
   virtual AbortCallback ReadFile(
       int file_handle,
       net::IOBuffer* buffer,
@@ -63,32 +63,32 @@ class ProvidedFileSystem : public ProvidedFileSystemInterface {
       const base::FilePath& directory_path,
       bool exclusive,
       bool recursive,
-      const fileapi::AsyncFileUtil::StatusCallback& callback) OVERRIDE;
+      const storage::AsyncFileUtil::StatusCallback& callback) OVERRIDE;
   virtual AbortCallback DeleteEntry(
       const base::FilePath& entry_path,
       bool recursive,
-      const fileapi::AsyncFileUtil::StatusCallback& callback) OVERRIDE;
+      const storage::AsyncFileUtil::StatusCallback& callback) OVERRIDE;
   virtual AbortCallback CreateFile(
       const base::FilePath& file_path,
-      const fileapi::AsyncFileUtil::StatusCallback& callback) OVERRIDE;
+      const storage::AsyncFileUtil::StatusCallback& callback) OVERRIDE;
   virtual AbortCallback CopyEntry(
       const base::FilePath& source_path,
       const base::FilePath& target_path,
-      const fileapi::AsyncFileUtil::StatusCallback& callback) OVERRIDE;
+      const storage::AsyncFileUtil::StatusCallback& callback) OVERRIDE;
   virtual AbortCallback MoveEntry(
       const base::FilePath& source_path,
       const base::FilePath& target_path,
-      const fileapi::AsyncFileUtil::StatusCallback& callback) OVERRIDE;
+      const storage::AsyncFileUtil::StatusCallback& callback) OVERRIDE;
   virtual AbortCallback Truncate(
       const base::FilePath& file_path,
       int64 length,
-      const fileapi::AsyncFileUtil::StatusCallback& callback) OVERRIDE;
+      const storage::AsyncFileUtil::StatusCallback& callback) OVERRIDE;
   virtual AbortCallback WriteFile(
       int file_handle,
       net::IOBuffer* buffer,
       int64 offset,
       int length,
-      const fileapi::AsyncFileUtil::StatusCallback& callback) OVERRIDE;
+      const storage::AsyncFileUtil::StatusCallback& callback) OVERRIDE;
   virtual const ProvidedFileSystemInfo& GetFileSystemInfo() const OVERRIDE;
   virtual RequestManager* GetRequestManager() OVERRIDE;
   virtual base::WeakPtr<ProvidedFileSystemInterface> GetWeakPtr() OVERRIDE;
@@ -98,7 +98,7 @@ class ProvidedFileSystem : public ProvidedFileSystemInterface {
   // |operation_request_id|. The request is removed immediately on the C++ side
   // despite being handled by the providing extension or not.
   void Abort(int operation_request_id,
-             const fileapi::AsyncFileUtil::StatusCallback& callback);
+             const storage::AsyncFileUtil::StatusCallback& callback);
 
   Profile* profile_;                       // Not owned.
   extensions::EventRouter* event_router_;  // Not owned. May be NULL.