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

storage/browser/fileapi/quota/quota_reservation_manager.h

Index: storage/browser/fileapi/quota/quota_reservation_manager.h
diff --git a/webkit/browser/fileapi/quota/quota_reservation_manager.h b/storage/browser/fileapi/quota/quota_reservation_manager.h
similarity index 86%
rename from webkit/browser/fileapi/quota/quota_reservation_manager.h
rename to storage/browser/fileapi/quota/quota_reservation_manager.h
index 6dc66ec4345704ea0bf157783dae3dbf5a5d7d8d..5a7ad892cd504f55576c7c04f9be1a3fc9cfd3c8 100644
--- a/webkit/browser/fileapi/quota/quota_reservation_manager.h
+++ b/storage/browser/fileapi/quota/quota_reservation_manager.h
@@ -14,21 +14,21 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "url/gurl.h"
-#include "webkit/browser/webkit_storage_browser_export.h"
-#include "webkit/common/fileapi/file_system_types.h"
+#include "storage/common/storage_export.h"
+#include "storage/common/fileapi/file_system_types.h"
 
 namespace content {
 class QuotaReservationManagerTest;
 }
 
-namespace fileapi {
+namespace storage {
 
 class QuotaReservation;
 class QuotaReservationBuffer;
 class OpenFileHandle;
 class OpenFileHandleContext;
 
-class WEBKIT_STORAGE_BROWSER_EXPORT QuotaReservationManager {
+class STORAGE_EXPORT QuotaReservationManager {
  public:
   // Callback for ReserveQuota. When this callback returns false, ReserveQuota
   // operation should be reverted.
@@ -36,7 +36,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT QuotaReservationManager {
       ReserveQuotaCallback;
 
   // An abstraction of backing quota system.
-  class WEBKIT_STORAGE_BROWSER_EXPORT QuotaBackend {
+  class STORAGE_EXPORT QuotaBackend {
    public:
     QuotaBackend() {}
     virtual ~QuotaBackend() {}
@@ -64,9 +64,9 @@ class WEBKIT_STORAGE_BROWSER_EXPORT QuotaReservationManager {
                                   int64 delta) = 0;
 
     virtual void IncrementDirtyCount(const GURL& origin,
-                                    FileSystemType type) = 0;
+                                     FileSystemType type) = 0;
     virtual void DecrementDirtyCount(const GURL& origin,
-                                    FileSystemType type) = 0;
+                                     FileSystemType type) = 0;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(QuotaBackend);
@@ -77,9 +77,8 @@ class WEBKIT_STORAGE_BROWSER_EXPORT QuotaReservationManager {
 
   // The entry point of the quota reservation.  Creates new reservation object
   // for |origin| and |type|.
-  scoped_refptr<QuotaReservation> CreateReservation(
-      const GURL& origin,
-      FileSystemType type);
+  scoped_refptr<QuotaReservation> CreateReservation(const GURL& origin,
+                                                    FileSystemType type);
 
  private:
   typedef std::map<std::pair<GURL, FileSystemType>, QuotaReservationBuffer*>
@@ -98,9 +97,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT QuotaReservationManager {
                             FileSystemType type,
                             int64 size);
 
-  void CommitQuotaUsage(const GURL& origin,
-                        FileSystemType type,
-                        int64 delta);
+  void CommitQuotaUsage(const GURL& origin, FileSystemType type, int64 delta);
 
   void IncrementDirtyCount(const GURL& origin, FileSystemType type);
   void DecrementDirtyCount(const GURL& origin, FileSystemType type);
@@ -122,6 +119,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT QuotaReservationManager {
   DISALLOW_COPY_AND_ASSIGN(QuotaReservationManager);
 };
 
-}  // namespace fileapi
+}  // namespace storage
 
 #endif  // WEBKIT_BROWSER_FILEAPI_QUOTA_QUOTA_RESERVATION_MANAGER_H_