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

storage/browser/fileapi/file_system_quota_util.h

Index: storage/browser/fileapi/file_system_quota_util.h
diff --git a/webkit/browser/fileapi/file_system_quota_util.h b/storage/browser/fileapi/file_system_quota_util.h
similarity index 72%
rename from webkit/browser/fileapi/file_system_quota_util.h
rename to storage/browser/fileapi/file_system_quota_util.h
index 7e6badf0694dd0e14efa615061e2fc7fcf27187b..899897c8d397b22f7d7d0eb092b0e723015e389e 100644
--- a/webkit/browser/fileapi/file_system_quota_util.h
+++ b/storage/browser/fileapi/file_system_quota_util.h
@@ -11,9 +11,9 @@
 #include "base/basictypes.h"
 #include "base/files/file.h"
 #include "url/gurl.h"
-#include "webkit/browser/fileapi/task_runner_bound_observer_list.h"
-#include "webkit/browser/webkit_storage_browser_export.h"
-#include "webkit/common/fileapi/file_system_types.h"
+#include "storage/browser/fileapi/task_runner_bound_observer_list.h"
+#include "storage/common/storage_export.h"
+#include "storage/common/fileapi/file_system_types.h"
 
 namespace base {
 class SequencedTaskRunner;
@@ -23,7 +23,7 @@ namespace quota {
 class QuotaManagerProxy;
 }
 
-namespace fileapi {
+namespace storage {
 
 class FileSystemContext;
 class QuotaReservation;
@@ -32,7 +32,7 @@ class QuotaReservation;
 // for file_system_quota_client.
 // All the methods of this class are synchronous and need to be called on
 // the thread that the method name implies.
-class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemQuotaUtil {
+class STORAGE_EXPORT FileSystemQuotaUtil {
  public:
   virtual ~FileSystemQuotaUtil() {}
 
@@ -44,26 +44,23 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemQuotaUtil {
       const GURL& origin_url,
       FileSystemType type) = 0;
 
-  virtual void GetOriginsForTypeOnFileTaskRunner(
-      fileapi::FileSystemType type,
-      std::set<GURL>* origins) = 0;
+  virtual void GetOriginsForTypeOnFileTaskRunner(storage::FileSystemType type,
+                                                 std::set<GURL>* origins) = 0;
 
-  virtual void GetOriginsForHostOnFileTaskRunner(
-      fileapi::FileSystemType type,
-      const std::string& host,
-      std::set<GURL>* origins) = 0;
+  virtual void GetOriginsForHostOnFileTaskRunner(storage::FileSystemType type,
+                                                 const std::string& host,
+                                                 std::set<GURL>* origins) = 0;
 
   // Returns the amount of data used for the origin for usage tracking.
   virtual int64 GetOriginUsageOnFileTaskRunner(
-      fileapi::FileSystemContext* file_system_context,
+      storage::FileSystemContext* file_system_context,
       const GURL& origin_url,
-      fileapi::FileSystemType type) = 0;
+      storage::FileSystemType type) = 0;
 
   // Creates new reservation object for the origin and the type.
   virtual scoped_refptr<QuotaReservation>
-      CreateQuotaReservationOnFileTaskRunner(
-          const GURL& origin_url,
-          FileSystemType type) = 0;
+      CreateQuotaReservationOnFileTaskRunner(const GURL& origin_url,
+                                             FileSystemType type) = 0;
 
   virtual void AddFileUpdateObserver(
       FileSystemType type,
@@ -88,6 +85,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemQuotaUtil {
       FileSystemType type) const = 0;
 };
 
-}  // namespace fileapi
+}  // namespace storage
 
 #endif  // WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_QUOTA_UTIL_H_