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

storage/browser/quota/storage_monitor.cc

Index: storage/browser/quota/storage_monitor.cc
diff --git a/webkit/browser/quota/storage_monitor.cc b/storage/browser/quota/storage_monitor.cc
similarity index 87%
rename from webkit/browser/quota/storage_monitor.cc
rename to storage/browser/quota/storage_monitor.cc
index bb56af3225ae7c4276ed6c7467d9190ac0289881..aa98d4065e283e1b048836fe6dc2a9f9b8251cb5 100644
--- a/webkit/browser/quota/storage_monitor.cc
+++ b/storage/browser/quota/storage_monitor.cc
@@ -2,29 +2,31 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/browser/quota/storage_monitor.h"
+#include "storage/browser/quota/storage_monitor.h"
 
 #include <algorithm>
 
 #include "base/stl_util.h"
 #include "net/base/net_util.h"
-#include "webkit/browser/quota/quota_manager.h"
-#include "webkit/common/quota/quota_status_code.h"
+#include "storage/browser/quota/quota_manager.h"
+#include "storage/common/quota/quota_status_code.h"
 
 namespace quota {
 
 // StorageObserverList:
 
-StorageObserverList::ObserverState::ObserverState()
-    : requires_update(false) {
+StorageObserverList::ObserverState::ObserverState() : requires_update(false) {
 }
 
-StorageObserverList::StorageObserverList() {}
+StorageObserverList::StorageObserverList() {
+}
 
-StorageObserverList::~StorageObserverList() {}
+StorageObserverList::~StorageObserverList() {
+}
 
 void StorageObserverList::AddObserver(
-    StorageObserver* observer, const StorageObserver::MonitorParams& params) {
+    StorageObserver* observer,
+    const StorageObserver::MonitorParams& params) {
   ObserverState& observer_state = observers_[observer];
   observer_state.origin = params.filter.origin;
   observer_state.rate = params.rate;
@@ -40,7 +42,8 @@ int StorageObserverList::ObserverCount() const {
 
 void StorageObserverList::OnStorageChange(const StorageObserver::Event& event) {
   for (StorageObserverStateMap::iterator it = observers_.begin();
-       it != observers_.end(); ++it) {
+       it != observers_.end();
+       ++it) {
     it->second.requires_update = true;
   }
 
@@ -54,7 +57,8 @@ void StorageObserverList::MaybeDispatchEvent(
   bool all_observers_notified = true;
 
   for (StorageObserverStateMap::iterator it = observers_.begin();
-       it != observers_.end(); ++it) {
+       it != observers_.end();
+       ++it) {
     if (!it->second.requires_update)
       continue;
 
@@ -92,10 +96,7 @@ void StorageObserverList::MaybeDispatchEvent(
   if (!all_observers_notified) {
     pending_event_ = event;
     notification_timer_.Start(
-        FROM_HERE,
-        min_delay,
-        this,
-        &StorageObserverList::DispatchPendingEvent);
+        FROM_HERE, min_delay, this, &StorageObserverList::DispatchPendingEvent);
   }
 }
 
@@ -108,7 +109,6 @@ void StorageObserverList::DispatchPendingEvent() {
   MaybeDispatchEvent(pending_event_);
 }
 
-
 // HostStorageObservers:
 
 HostStorageObservers::HostStorageObservers(QuotaManager* quota_manager)
@@ -122,7 +122,8 @@ HostStorageObservers::HostStorageObservers(QuotaManager* quota_manager)
       weak_factory_(this) {
 }
 
-HostStorageObservers::~HostStorageObservers() {}
+HostStorageObservers::~HostStorageObservers() {
+}
 
 void HostStorageObservers::AddObserver(
     StorageObserver* observer,
@@ -155,7 +156,8 @@ bool HostStorageObservers::ContainsObservers() const {
 }
 
 void HostStorageObservers::NotifyUsageChange(
-    const StorageObserver::Filter& filter, int64 delta) {
+    const StorageObserver::Filter& filter,
+    int64 delta) {
   if (initialized_) {
     cached_usage_ += delta;
     DispatchEvent(filter, true);
@@ -208,8 +210,8 @@ void HostStorageObservers::GotHostUsageAndQuota(
   DispatchEvent(filter, event_occurred_before_init_);
 }
 
-void HostStorageObservers::DispatchEvent(
-    const StorageObserver::Filter& filter, bool is_update) {
+void HostStorageObservers::DispatchEvent(const StorageObserver::Filter& filter,
+                                         bool is_update) {
   StorageObserver::Event event(filter,
                                std::max<int64>(cached_usage_, 0),
                                std::max<int64>(cached_quota_, 0));
@@ -219,7 +221,6 @@ void HostStorageObservers::DispatchEvent(
     observers_.MaybeDispatchEvent(event);
 }
 
-
 // StorageTypeObservers:
 
 StorageTypeObservers::StorageTypeObservers(QuotaManager* quota_manager)
@@ -231,7 +232,8 @@ StorageTypeObservers::~StorageTypeObservers() {
 }
 
 void StorageTypeObservers::AddObserver(
-    StorageObserver* observer, const StorageObserver::MonitorParams& params) {
+    StorageObserver* observer,
+    const StorageObserver::MonitorParams& params) {
   std::string host = net::GetHostOrSpecFromURL(params.filter.origin);
   if (host.empty())
     return;
@@ -250,7 +252,7 @@ void StorageTypeObservers::AddObserver(
 
 void StorageTypeObservers::RemoveObserver(StorageObserver* observer) {
   for (HostObserversMap::iterator it = host_observers_map_.begin();
-       it != host_observers_map_.end(); ) {
+       it != host_observers_map_.end();) {
     it->second->RemoveObserver(observer);
     if (!it->second->ContainsObservers()) {
       delete it->second;
@@ -262,7 +264,8 @@ void StorageTypeObservers::RemoveObserver(StorageObserver* observer) {
 }
 
 void StorageTypeObservers::RemoveObserverForFilter(
-    StorageObserver* observer, const StorageObserver::Filter& filter) {
+    StorageObserver* observer,
+    const StorageObserver::Filter& filter) {
   std::string host = net::GetHostOrSpecFromURL(filter.origin);
   HostObserversMap::iterator it = host_observers_map_.find(host);
   if (it == host_observers_map_.end())
@@ -285,7 +288,8 @@ const HostStorageObservers* StorageTypeObservers::GetHostObservers(
 }
 
 void StorageTypeObservers::NotifyUsageChange(
-    const StorageObserver::Filter& filter, int64 delta) {
+    const StorageObserver::Filter& filter,
+    int64 delta) {
   std::string host = net::GetHostOrSpecFromURL(filter.origin);
   HostObserversMap::iterator it = host_observers_map_.find(host);
   if (it == host_observers_map_.end())
@@ -294,7 +298,6 @@ void StorageTypeObservers::NotifyUsageChange(
   it->second->NotifyUsageChange(filter, delta);
 }
 
-
 // StorageMonitor:
 
 StorageMonitor::StorageMonitor(QuotaManager* quota_manager)
@@ -305,8 +308,8 @@ StorageMonitor::~StorageMonitor() {
   STLDeleteValues(&storage_type_observers_map_);
 }
 
-void StorageMonitor::AddObserver(
-    StorageObserver* observer, const StorageObserver::MonitorParams& params) {
+void StorageMonitor::AddObserver(StorageObserver* observer,
+                                 const StorageObserver::MonitorParams& params) {
   DCHECK(observer);
 
   // Check preconditions.
@@ -333,13 +336,15 @@ void StorageMonitor::AddObserver(
 void StorageMonitor::RemoveObserver(StorageObserver* observer) {
   for (StorageTypeObserversMap::iterator it =
            storage_type_observers_map_.begin();
-       it != storage_type_observers_map_.end(); ++it) {
+       it != storage_type_observers_map_.end();
+       ++it) {
     it->second->RemoveObserver(observer);
   }
 }
 
 void StorageMonitor::RemoveObserverForFilter(
-    StorageObserver* observer, const StorageObserver::Filter& filter) {
+    StorageObserver* observer,
+    const StorageObserver::Filter& filter) {
   StorageTypeObserversMap::iterator it =
       storage_type_observers_map_.find(filter.storage_type);
   if (it == storage_type_observers_map_.end())
@@ -358,8 +363,8 @@ const StorageTypeObservers* StorageMonitor::GetStorageTypeObservers(
   return NULL;
 }
 
-void StorageMonitor::NotifyUsageChange(
-    const StorageObserver::Filter& filter, int64 delta) {
+void StorageMonitor::NotifyUsageChange(const StorageObserver::Filter& filter,
+                                       int64 delta) {
   // Check preconditions.
   if (filter.storage_type == kStorageTypeUnknown ||
       filter.storage_type == kStorageTypeQuotaNotManaged ||