ExtensionStorageMonitor: use smaller, self-registering StorageObservers

storage/browser/quota/storage_monitor.cc

Index: storage/browser/quota/storage_monitor.cc
diff --git a/storage/browser/quota/storage_monitor.cc b/storage/browser/quota/storage_monitor.cc
index eafa5a6e7f797a800f363f5d2e2d68902336f872..a978fd6e9bee7fffdbdc335dee61eaad8b242586 100644
--- a/storage/browser/quota/storage_monitor.cc
+++ b/storage/browser/quota/storage_monitor.cc
@@ -277,18 +277,6 @@ void StorageTypeObservers::RemoveObserver(StorageObserver* observer) {
   }
 }
 
-void StorageTypeObservers::RemoveObserverForFilter(
-    StorageObserver* observer, const StorageObserver::Filter& filter) {
-  std::string host = net::GetHostOrSpecFromURL(filter.origin);
-  auto it = host_observers_map_.find(host);
-  if (it == host_observers_map_.end())
-    return;
-
-  it->second->RemoveObserver(observer);
-  if (!it->second->ContainsObservers())
-    host_observers_map_.erase(it);
-}
-
 const HostStorageObservers* StorageTypeObservers::GetHostObservers(
     const std::string& host) const {
   auto it = host_observers_map_.find(host);
@@ -346,15 +334,6 @@ void StorageMonitor::RemoveObserver(StorageObserver* observer) {
   }
 }
 
-void StorageMonitor::RemoveObserverForFilter(
-    StorageObserver* observer, const StorageObserver::Filter& filter) {
-  auto it = storage_type_observers_map_.find(filter.storage_type);
-  if (it == storage_type_observers_map_.end())
-    return;
-
-  it->second->RemoveObserverForFilter(observer, filter);
-}
-
 const StorageTypeObservers* StorageMonitor::GetStorageTypeObservers(
     StorageType storage_type) const {
   auto it = storage_type_observers_map_.find(storage_type);