Use PrefChangeRegistrar everywhere

chrome/browser/prefs/pref_change_registrar_unittest.cc

 // Copyright (c) 2010 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 "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/testing_pref_service.h"
@@ skipping 45 matching lines @@
   PrefChangeRegistrar registrar;
   registrar.Init(service());
 
   // Test adding.
   EXPECT_CALL(*service(),
               AddPrefObserver(Eq(std::string("test.pref.1")), observer()));
   EXPECT_CALL(*service(),
               AddPrefObserver(Eq(std::string("test.pref.2")), observer()));
   registrar.Add("test.pref.1", observer());
   registrar.Add("test.pref.2", observer());
+  EXPECT_FALSE(registrar.IsEmpty());
 
   // Test removing.
   Mock::VerifyAndClearExpectations(service());
   EXPECT_CALL(*service(),
               RemovePrefObserver(Eq(std::string("test.pref.1")), observer()));
   EXPECT_CALL(*service(),
               RemovePrefObserver(Eq(std::string("test.pref.2")), observer()));
   registrar.Remove("test.pref.1", observer());
   registrar.Remove("test.pref.2", observer());
+  EXPECT_TRUE(registrar.IsEmpty());
+
+  // Explicitly check the expectations now to make sure that the Removes
+  // worked (rather than the registrar destructor doing the work).
+  Mock::VerifyAndClearExpectations(service());
 }
 
 TEST_F(PrefChangeRegistrarTest, AutoRemove) {
   PrefChangeRegistrar registrar;
   registrar.Init(service());
 
   // Setup of auto-remove.
   EXPECT_CALL(*service(),
               AddPrefObserver(Eq(std::string("test.pref.1")), observer()));
   registrar.Add("test.pref.1", observer());
   Mock::VerifyAndClearExpectations(service());
+  EXPECT_FALSE(registrar.IsEmpty());
 
   // Test auto-removing.
   EXPECT_CALL(*service(),
               RemovePrefObserver(Eq(std::string("test.pref.1")), observer()));
 }
+
+TEST_F(PrefChangeRegistrarTest, RemoveAll) {
+  PrefChangeRegistrar registrar;
+  registrar.Init(service());
+
+  EXPECT_CALL(*service(),
+              AddPrefObserver(Eq(std::string("test.pref.1")), observer()));
+  EXPECT_CALL(*service(),
+              AddPrefObserver(Eq(std::string("test.pref.2")), observer()));
+  registrar.Add("test.pref.1", observer());
+  registrar.Add("test.pref.2", observer());
+  Mock::VerifyAndClearExpectations(service());
+
+  EXPECT_CALL(*service(),
+              RemovePrefObserver(Eq(std::string("test.pref.1")), observer()));
+  EXPECT_CALL(*service(),
+              RemovePrefObserver(Eq(std::string("test.pref.2")), observer()));
+  registrar.RemoveAll();
+  EXPECT_TRUE(registrar.IsEmpty());
+
+  // Explicitly check the expectations now to make sure that the RemoveAll
+  // worked (rather than the registrar destructor doing the work).
+  Mock::VerifyAndClearExpectations(service());
+}