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

storage/browser/fileapi/sandbox_file_system_backend_delegate.h

Index: storage/browser/fileapi/sandbox_file_system_backend_delegate.h
diff --git a/webkit/browser/fileapi/sandbox_file_system_backend_delegate.h b/storage/browser/fileapi/sandbox_file_system_backend_delegate.h
similarity index 83%
rename from webkit/browser/fileapi/sandbox_file_system_backend_delegate.h
rename to storage/browser/fileapi/sandbox_file_system_backend_delegate.h
index 2b67cfcc3cbc81c20fb9ea58a03c4bc5ecc4b1f9..a473a867b4fab10b1162ed732d561ae740f203d9 100644
--- a/webkit/browser/fileapi/sandbox_file_system_backend_delegate.h
+++ b/storage/browser/fileapi/sandbox_file_system_backend_delegate.h
@@ -17,10 +17,10 @@
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "base/time/time.h"
-#include "webkit/browser/fileapi/file_system_backend.h"
-#include "webkit/browser/fileapi/file_system_options.h"
-#include "webkit/browser/fileapi/file_system_quota_util.h"
-#include "webkit/browser/webkit_storage_browser_export.h"
+#include "storage/browser/fileapi/file_system_backend.h"
+#include "storage/browser/fileapi/file_system_options.h"
+#include "storage/browser/fileapi/file_system_quota_util.h"
+#include "storage/common/storage_export.h"
 
 namespace base {
 class SequencedTaskRunner;
@@ -36,11 +36,11 @@ class QuotaManagerProxy;
 class SpecialStoragePolicy;
 }
 
-namespace webkit_blob {
+namespace storage {
 class FileStreamReader;
 }
 
-namespace fileapi {
+namespace storage {
 
 class AsyncFileUtil;
 class FileStreamWriter;
@@ -55,7 +55,7 @@ class SandboxQuotaObserver;
 
 // Delegate implementation of the some methods in Sandbox/SyncFileSystemBackend.
 // An instance of this class is created and owned by FileSystemContext.
-class WEBKIT_STORAGE_BROWSER_EXPORT SandboxFileSystemBackendDelegate
+class STORAGE_EXPORT SandboxFileSystemBackendDelegate
     : public FileSystemQuotaUtil {
  public:
   typedef FileSystemBackend::OpenFileSystemCallback OpenFileSystemCallback;
@@ -98,23 +98,21 @@ class WEBKIT_STORAGE_BROWSER_EXPORT SandboxFileSystemBackendDelegate
   // the 'unique' part.)
   // Returns an empty path if the given type is invalid.
   // This method can only be called on the file thread.
-  base::FilePath GetBaseDirectoryForOriginAndType(
-      const GURL& origin_url,
-      FileSystemType type,
-      bool create);
+  base::FilePath GetBaseDirectoryForOriginAndType(const GURL& origin_url,
+                                                  FileSystemType type,
+                                                  bool create);
 
   // FileSystemBackend helpers.
-  void OpenFileSystem(
-      const GURL& origin_url,
-      FileSystemType type,
-      OpenFileSystemMode mode,
-      const OpenFileSystemCallback& callback,
-      const GURL& root_url);
+  void OpenFileSystem(const GURL& origin_url,
+                      FileSystemType type,
+                      OpenFileSystemMode mode,
+                      const OpenFileSystemCallback& callback,
+                      const GURL& root_url);
   scoped_ptr<FileSystemOperationContext> CreateFileSystemOperationContext(
       const FileSystemURL& url,
       FileSystemContext* context,
       base::File::Error* error_code) const;
-  scoped_ptr<webkit_blob::FileStreamReader> CreateFileStreamReader(
+  scoped_ptr<storage::FileStreamReader> CreateFileStreamReader(
       const FileSystemURL& url,
       int64 offset,
       const base::Time& expected_modification_time,
@@ -138,14 +136,12 @@ class WEBKIT_STORAGE_BROWSER_EXPORT SandboxFileSystemBackendDelegate
       FileSystemType type,
       const std::string& host,
       std::set<GURL>* origins) OVERRIDE;
-  virtual int64 GetOriginUsageOnFileTaskRunner(
-      FileSystemContext* context,
-      const GURL& origin_url,
-      FileSystemType type) OVERRIDE;
+  virtual int64 GetOriginUsageOnFileTaskRunner(FileSystemContext* context,
+                                               const GURL& origin_url,
+                                               FileSystemType type) OVERRIDE;
   virtual scoped_refptr<QuotaReservation>
-      CreateQuotaReservationOnFileTaskRunner(
-          const GURL& origin_url,
-          FileSystemType type) OVERRIDE;
+      CreateQuotaReservationOnFileTaskRunner(const GURL& origin_url,
+                                             FileSystemType type) OVERRIDE;
   virtual void AddFileUpdateObserver(
       FileSystemType type,
       FileUpdateObserver* observer,
@@ -168,10 +164,8 @@ class WEBKIT_STORAGE_BROWSER_EXPORT SandboxFileSystemBackendDelegate
   // Registers quota observer for file updates on filesystem of |type|.
   void RegisterQuotaUpdateObserver(FileSystemType type);
 
-  void InvalidateUsageCache(const GURL& origin_url,
-                            FileSystemType type);
-  void StickyInvalidateUsageCache(const GURL& origin_url,
-                                  FileSystemType type);
+  void InvalidateUsageCache(const GURL& origin_url, FileSystemType type);
+  void StickyInvalidateUsageCache(const GURL& origin_url, FileSystemType type);
 
   void CollectOpenFileSystemMetrics(base::File::Error error_code);
 
@@ -208,9 +202,8 @@ class WEBKIT_STORAGE_BROWSER_EXPORT SandboxFileSystemBackendDelegate
   bool IsAllowedScheme(const GURL& url) const;
 
   // Returns a path to the usage cache file.
-  base::FilePath GetUsageCachePathForOriginAndType(
-      const GURL& origin_url,
-      FileSystemType type);
+  base::FilePath GetUsageCachePathForOriginAndType(const GURL& origin_url,
+                                                   FileSystemType type);
 
   // Returns a path to the usage cache file (static version).
   static base::FilePath GetUsageCachePathForOriginAndType(
@@ -255,6 +248,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT SandboxFileSystemBackendDelegate
   DISALLOW_COPY_AND_ASSIGN(SandboxFileSystemBackendDelegate);
 };
 
-}  // namespace fileapi
+}  // namespace storage
 
 #endif  // WEBKIT_BROWSER_FILEAPI_SANDBOX_FILE_SYSTEM_BACKEND_DELEGATE_H_