Move storage-related files from webkit/ to new top-level directory storage/

content/public/test/test_file_system_backend.h

Index: content/public/test/test_file_system_backend.h
diff --git a/content/public/test/test_file_system_backend.h b/content/public/test/test_file_system_backend.h
index 1b0c76bc365cac71fa26c393530c3c939b81a1a0..542600744fdce5ce059c84f4d807bba342d31c1f 100644
--- a/content/public/test/test_file_system_backend.h
+++ b/content/public/test/test_file_system_backend.h
@@ -8,15 +8,15 @@
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "webkit/browser/fileapi/async_file_util_adapter.h"
-#include "webkit/browser/fileapi/file_system_backend.h"
-#include "webkit/browser/fileapi/task_runner_bound_observer_list.h"
+#include "storage/browser/fileapi/async_file_util_adapter.h"
+#include "storage/browser/fileapi/file_system_backend.h"
+#include "storage/browser/fileapi/task_runner_bound_observer_list.h"
 
 namespace base {
 class SequencedTaskRunner;
 }
 
-namespace fileapi {
+namespace storage {
 class AsyncFileUtilAdapter;
 class FileSystemQuotaUtil;
 }
@@ -26,7 +26,7 @@ namespace content {
 // This should be only used for testing.
 // This file system backend uses LocalFileUtil and stores data file
 // under the given directory.
-class TestFileSystemBackend : public fileapi::FileSystemBackend {
+class TestFileSystemBackend : public storage::FileSystemBackend {
  public:
   TestFileSystemBackend(
       base::SequencedTaskRunner* task_runner,
@@ -34,42 +34,41 @@ class TestFileSystemBackend : public fileapi::FileSystemBackend {
   virtual ~TestFileSystemBackend();
 
   // FileSystemBackend implementation.
-  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;
-  virtual scoped_ptr<webkit_blob::FileStreamReader> CreateFileStreamReader(
-      const fileapi::FileSystemURL& url,
+      const storage::FileSystemURL& url) 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;
 
   // Initialize the CopyOrMoveFileValidatorFactory. Invalid to call more than
   // once.
   void InitializeCopyOrMoveFileValidatorFactory(
-      scoped_ptr<fileapi::CopyOrMoveFileValidatorFactory> factory);
+      scoped_ptr<storage::CopyOrMoveFileValidatorFactory> factory);
 
-  const fileapi::UpdateObserverList*
-      GetUpdateObservers(fileapi::FileSystemType type) const;
-  void AddFileChangeObserver(fileapi::FileChangeObserver* observer);
+  const storage::UpdateObserverList* GetUpdateObservers(
+      storage::FileSystemType type) const;
+  void AddFileChangeObserver(storage::FileChangeObserver* observer);
 
   // For CopyOrMoveFileValidatorFactory testing. Once it's set to true
   // GetCopyOrMoveFileValidatorFactory will start returning security
@@ -83,11 +82,11 @@ class TestFileSystemBackend : public fileapi::FileSystemBackend {
 
   base::FilePath base_path_;
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
-  scoped_ptr<fileapi::AsyncFileUtilAdapter> file_util_;
+  scoped_ptr<storage::AsyncFileUtilAdapter> file_util_;
   scoped_ptr<QuotaUtil> quota_util_;
 
   bool require_copy_or_move_validator_;
-  scoped_ptr<fileapi::CopyOrMoveFileValidatorFactory>
+  scoped_ptr<storage::CopyOrMoveFileValidatorFactory>
       copy_or_move_file_validator_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TestFileSystemBackend);