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

chrome/browser/sync_file_system/local/sync_file_system_backend.h

Index: chrome/browser/sync_file_system/local/sync_file_system_backend.h
diff --git a/chrome/browser/sync_file_system/local/sync_file_system_backend.h b/chrome/browser/sync_file_system/local/sync_file_system_backend.h
index 4f2a9a7ab9ba6aa4a998b3b894131c9eb5516e65..473ea7e04c9923c7977686c1ad8d3e185f2ea7b6 100644
--- a/chrome/browser/sync_file_system/local/sync_file_system_backend.h
+++ b/chrome/browser/sync_file_system/local/sync_file_system_backend.h
@@ -19,8 +19,7 @@ namespace sync_file_system {
 class LocalFileChangeTracker;
 class LocalFileSyncContext;
 
-class SyncFileSystemBackend
-    : public fileapi::FileSystemBackend {
+class SyncFileSystemBackend : public storage::FileSystemBackend {
  public:
   explicit SyncFileSystemBackend(Profile* profile);
   virtual ~SyncFileSystemBackend();
@@ -28,38 +27,37 @@ class SyncFileSystemBackend
   static SyncFileSystemBackend* CreateForTesting();
 
   // FileSystemBackend overrides.
-  virtual bool CanHandleType(fileapi::FileSystemType type) const OVERRIDE;
-  virtual void Initialize(fileapi::FileSystemContext* context) OVERRIDE;
-  virtual void ResolveURL(const fileapi::FileSystemURL& url,
-                          fileapi::OpenFileSystemMode mode,
+  virtual bool CanHandleType(storage::FileSystemType type) const OVERRIDE;
+  virtual void Initialize(storage::FileSystemContext* context) OVERRIDE;
+  virtual void ResolveURL(const storage::FileSystemURL& url,
+                          storage::OpenFileSystemMode mode,
                           const OpenFileSystemCallback& callback) OVERRIDE;
-  virtual fileapi::AsyncFileUtil* GetAsyncFileUtil(
-      fileapi::FileSystemType type) OVERRIDE;
-  virtual fileapi::CopyOrMoveFileValidatorFactory*
-      GetCopyOrMoveFileValidatorFactory(
-          fileapi::FileSystemType type,
-          base::File::Error* error_code) OVERRIDE;
-  virtual fileapi::FileSystemOperation* CreateFileSystemOperation(
-      const fileapi::FileSystemURL& url,
-      fileapi::FileSystemContext* context,
+  virtual storage::AsyncFileUtil* GetAsyncFileUtil(
+      storage::FileSystemType type) OVERRIDE;
+  virtual storage::CopyOrMoveFileValidatorFactory*
+      GetCopyOrMoveFileValidatorFactory(storage::FileSystemType type,
+                                        base::File::Error* error_code) OVERRIDE;
+  virtual storage::FileSystemOperation* CreateFileSystemOperation(
+      const storage::FileSystemURL& url,
+      storage::FileSystemContext* context,
       base::File::Error* error_code) const OVERRIDE;
   virtual bool SupportsStreaming(
-      const fileapi::FileSystemURL& url) const OVERRIDE;
+      const storage::FileSystemURL& url) const OVERRIDE;
   virtual bool HasInplaceCopyImplementation(
-      fileapi::FileSystemType type) const OVERRIDE;
-  virtual scoped_ptr<webkit_blob::FileStreamReader> CreateFileStreamReader(
-      const fileapi::FileSystemURL& url,
+      storage::FileSystemType type) const OVERRIDE;
+  virtual scoped_ptr<storage::FileStreamReader> CreateFileStreamReader(
+      const storage::FileSystemURL& url,
       int64 offset,
       const base::Time& expected_modification_time,
-      fileapi::FileSystemContext* context) const OVERRIDE;
-  virtual scoped_ptr<fileapi::FileStreamWriter> CreateFileStreamWriter(
-      const fileapi::FileSystemURL& url,
+      storage::FileSystemContext* context) const OVERRIDE;
+  virtual scoped_ptr<storage::FileStreamWriter> CreateFileStreamWriter(
+      const storage::FileSystemURL& url,
       int64 offset,
-      fileapi::FileSystemContext* context) const OVERRIDE;
-  virtual fileapi::FileSystemQuotaUtil* GetQuotaUtil() OVERRIDE;
+      storage::FileSystemContext* context) const OVERRIDE;
+  virtual storage::FileSystemQuotaUtil* GetQuotaUtil() OVERRIDE;
 
   static SyncFileSystemBackend* GetBackend(
-      const fileapi::FileSystemContext* context);
+      const storage::FileSystemContext* context);
 
   LocalFileChangeTracker* change_tracker() { return change_tracker_.get(); }
   void SetLocalFileChangeTracker(scoped_ptr<LocalFileChangeTracker> tracker);
@@ -85,7 +83,7 @@ class SyncFileSystemBackend
   };
 
   // Not owned.
-  fileapi::FileSystemContext* context_;
+  storage::FileSystemContext* context_;
 
   scoped_ptr<LocalFileChangeTracker> change_tracker_;
   scoped_refptr<LocalFileSyncContext> sync_context_;
@@ -97,16 +95,16 @@ class SyncFileSystemBackend
   // testing.
   bool skip_initialize_syncfs_service_for_testing_;
 
-  fileapi::SandboxFileSystemBackendDelegate* GetDelegate() const;
+  storage::SandboxFileSystemBackendDelegate* GetDelegate() const;
 
   void InitializeSyncFileSystemService(
       const GURL& origin_url,
       const SyncStatusCallback& callback);
   void DidInitializeSyncFileSystemService(
-      fileapi::FileSystemContext* context,
+      storage::FileSystemContext* context,
       const GURL& origin_url,
-      fileapi::FileSystemType type,
-      fileapi::OpenFileSystemMode mode,
+      storage::FileSystemType type,
+      storage::OpenFileSystemMode mode,
       const OpenFileSystemCallback& callback,
       SyncStatusCode status);