ExtensionStorageMonitor: use smaller, self-registering StorageObservers

storage/browser/quota/storage_monitor.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "storage/browser/quota/storage_monitor.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 
@@ skipping 259 matching lines @@
        it != host_observers_map_.end();) {
     it->second->RemoveObserver(observer);
     if (!it->second->ContainsObservers()) {
       it = host_observers_map_.erase(it);
     } else {
       ++it;
     }
   }
 }
 
-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);
   if (it != host_observers_map_.end())
     return it->second.get();
 
   return nullptr;
 }
 
 void StorageTypeObservers::NotifyUsageChange(
@@ skipping 37 matching lines @@
   type_observers->AddObserver(observer, params);
 }
 
 void StorageMonitor::RemoveObserver(StorageObserver* observer) {
   for (auto it = storage_type_observers_map_.begin();
        it != storage_type_observers_map_.end(); ++it) {
     it->second->RemoveObserver(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);
   if (it != storage_type_observers_map_.end())
     return it->second.get();
 
   return nullptr;
 }
 
 void StorageMonitor::NotifyUsageChange(const StorageObserver::Filter& filter,
                                        int64_t delta) {
   // Check preconditions.
   if (filter.storage_type == kStorageTypeUnknown ||
       filter.storage_type == kStorageTypeQuotaNotManaged ||
       filter.origin.is_empty()) {
     NOTREACHED();
     return;
   }
 
   auto it = storage_type_observers_map_.find(filter.storage_type);
   if (it == storage_type_observers_map_.end())
     return;
 
   it->second->NotifyUsageChange(filter, delta);
 }
 
 }  // namespace storage