ExtensionStorageMonitor: use smaller, self-registering StorageObservers

storage/browser/quota/storage_monitor_unittest.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 <stdint.h>
 
 #include <vector>
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/run_loop.h"
@@ skipping 513 matching lines @@
   type_observers.AddObserver(&mock_observer1, params2);
   type_observers.AddObserver(&mock_observer2, params2);
   type_observers.AddObserver(&mock_observer3, params2);
 
   // Verify that the observers have been removed correctly.
   ASSERT_TRUE(type_observers.GetHostObservers(host1));
   ASSERT_TRUE(type_observers.GetHostObservers(host2));
   EXPECT_EQ(2, GetObserverCount(*type_observers.GetHostObservers(host1)));
   EXPECT_EQ(3, GetObserverCount(*type_observers.GetHostObservers(host2)));
 
-  // Remove an observer for a specific filter.
-  type_observers.RemoveObserverForFilter(&mock_observer1, params1.filter);
+  // Remove all instances of observer1.
+  type_observers.RemoveObserver(&mock_observer1);
   ASSERT_TRUE(type_observers.GetHostObservers(host1));
   ASSERT_TRUE(type_observers.GetHostObservers(host2));
   EXPECT_EQ(1, GetObserverCount(*type_observers.GetHostObservers(host1)));
-  EXPECT_EQ(3, GetObserverCount(*type_observers.GetHostObservers(host2)));
+  EXPECT_EQ(2, GetObserverCount(*type_observers.GetHostObservers(host2)));
 
-  // Remove all instances of an observer.
+  // Remove all instances of observer2.
   type_observers.RemoveObserver(&mock_observer2);
   ASSERT_TRUE(type_observers.GetHostObservers(host2));
-  EXPECT_EQ(2, GetObserverCount(*type_observers.GetHostObservers(host2)));
+  EXPECT_EQ(1, GetObserverCount(*type_observers.GetHostObservers(host2)));
   // Observers of host1 has been deleted as it is empty.
   EXPECT_FALSE(type_observers.GetHostObservers(host1));
 }
 
 // Tests for StorageMonitor:
 
 class StorageMonitorTest : public StorageTestWithManagerBase {
  public:
   StorageMonitorTest()
       : storage_monitor_(NULL),
@@ skipping 73 matching lines @@
   EXPECT_EQ(expected_event, mock_observer1_.LastEvent());
   EXPECT_EQ(expected_event, mock_observer2_.LastEvent());
 }
 
 // Test removing all instances of an observer.
 TEST_F(StorageMonitorTest, RemoveObserver) {
   storage_monitor_->RemoveObserver(&mock_observer1_);
   CheckObserverCount(1, 2);
 }
 
-// Test removing an observer for a specific filter.
-TEST_F(StorageMonitorTest, RemoveObserverForFilter) {
-  storage_monitor_->RemoveObserverForFilter(&mock_observer1_, params2_.filter);
-  CheckObserverCount(2, 2);
-}
-
 // Integration test for QuotaManager and StorageMonitor:
 
 class StorageMonitorIntegrationTest : public testing::Test {
  public:
   void SetUp() override {
     ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
     storage_policy_ = new MockSpecialStoragePolicy();
     quota_manager_ = new QuotaManager(
         false, data_dir_.GetPath(), base::ThreadTaskRunnerHandle::Get().get(),
         base::ThreadTaskRunnerHandle::Get().get(), storage_policy_.get(),
@@ skipping 42 matching lines @@
   base::RunLoop().RunUntilIdle();
 
   // Verify that the observer receives it.
   ASSERT_EQ(1, mock_observer.EventCount());
   const StorageObserver::Event& event = mock_observer.LastEvent();
   EXPECT_EQ(params.filter, event.filter);
   EXPECT_EQ(kTestUsage, event.usage);
 }
 
 }  // namespace content