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

storage/browser/quota/storage_monitor.h

Index: storage/browser/quota/storage_monitor.h
diff --git a/webkit/browser/quota/storage_monitor.h b/storage/browser/quota/storage_monitor.h
similarity index 91%
rename from webkit/browser/quota/storage_monitor.h
rename to storage/browser/quota/storage_monitor.h
index e52fd18de55af68bd00e8248330bd67f8474b1b6..e21bb916f4c27e80cf6a05485c523aa628966870 100644
--- a/webkit/browser/quota/storage_monitor.h
+++ b/storage/browser/quota/storage_monitor.h
@@ -10,7 +10,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
-#include "webkit/browser/quota/storage_observer.h"
+#include "storage/browser/quota/storage_observer.h"
 
 namespace content {
 class StorageMonitorTestBase;
@@ -22,7 +22,7 @@ class QuotaManager;
 
 // This class dispatches storage events to observers of a common
 // StorageObserver::Filter.
-class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE StorageObserverList {
+class STORAGE_EXPORT_PRIVATE StorageObserverList {
  public:
   StorageObserverList();
   virtual ~StorageObserverList();
@@ -47,7 +47,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE StorageObserverList {
   void ScheduleUpdateForObserver(StorageObserver* observer);
 
  private:
-  struct WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE ObserverState {
+  struct STORAGE_EXPORT_PRIVATE ObserverState {
     GURL origin;
     base::TimeTicks last_notification_time;
     base::TimeDelta rate;
@@ -68,10 +68,9 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE StorageObserverList {
   DISALLOW_COPY_AND_ASSIGN(StorageObserverList);
 };
 
-
 // Manages the storage observers of a common host. Caches the usage and quota of
 // the host to avoid accumulating for every change.
-class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE HostStorageObservers {
+class STORAGE_EXPORT_PRIVATE HostStorageObservers {
  public:
   explicit HostStorageObservers(QuotaManager* quota_manager);
   virtual ~HostStorageObservers();
@@ -79,9 +78,8 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE HostStorageObservers {
   bool is_initialized() const { return initialized_; }
 
   // Adds/removes an observer.
-  void AddObserver(
-      StorageObserver* observer,
-      const StorageObserver::MonitorParams& params);
+  void AddObserver(StorageObserver* observer,
+                   const StorageObserver::MonitorParams& params);
   void RemoveObserver(StorageObserver* observer);
   bool ContainsObservers() const;
 
@@ -116,9 +114,8 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE HostStorageObservers {
   DISALLOW_COPY_AND_ASSIGN(HostStorageObservers);
 };
 
-
 // Manages the observers of a common storage type.
-class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE StorageTypeObservers {
+class STORAGE_EXPORT_PRIVATE StorageTypeObservers {
  public:
   explicit StorageTypeObservers(QuotaManager* quota_manager);
   virtual ~StorageTypeObservers();
@@ -145,9 +142,8 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE StorageTypeObservers {
   DISALLOW_COPY_AND_ASSIGN(StorageTypeObservers);
 };
 
-
 // Storage monitor manages observers and dispatches storage events to them.
-class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE StorageMonitor {
+class STORAGE_EXPORT_PRIVATE StorageMonitor {
  public:
   explicit StorageMonitor(QuotaManager* quota_manager);
   virtual ~StorageMonitor();