Use PrefChangeRegistrar everywhere

chrome/browser/host_zoom_map_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 "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/host_zoom_map.h"
@@ skipping 52 matching lines @@
 TEST_F(HostZoomMapTest, Load) {
   DictionaryValue* dict =
       prefs_->GetMutableDictionary(prefs::kPerHostZoomLevels);
   dict->SetWithoutPathExpansion(host_, Value::CreateIntegerValue(kZoomLevel));
   scoped_refptr<HostZoomMap> map(new HostZoomMap(&profile_));
   EXPECT_EQ(kZoomLevel, map->GetZoomLevel(url_));
 }
 
 TEST_F(HostZoomMapTest, SetZoomLevel) {
   scoped_refptr<HostZoomMap> map(new HostZoomMap(&profile_));
-  prefs_->AddPrefObserver(prefs::kPerHostZoomLevels, &pref_observer_);
+  PrefChangeRegistrar registrar;
+  registrar.Init(prefs_);
+  registrar.Add(prefs::kPerHostZoomLevels, &pref_observer_);
   SetPrefObserverExpectation();
   map->SetZoomLevel(url_, kZoomLevel);
   EXPECT_EQ(kZoomLevel, map->GetZoomLevel(url_));
   const DictionaryValue* dict =
       prefs_->GetDictionary(prefs::kPerHostZoomLevels);
   int zoom_level = 0;
   EXPECT_TRUE(dict->GetIntegerWithoutPathExpansion(host_, &zoom_level));
   EXPECT_EQ(kZoomLevel, zoom_level);
 
   SetPrefObserverExpectation();
   map->SetZoomLevel(url_, 0);
   EXPECT_EQ(0, map->GetZoomLevel(url_));
   EXPECT_FALSE(dict->HasKey(host_));
-  prefs_->RemovePrefObserver(prefs::kPerHostZoomLevels, &pref_observer_);
 }
 
 TEST_F(HostZoomMapTest, ResetToDefaults) {
   scoped_refptr<HostZoomMap> map(new HostZoomMap(&profile_));
   map->SetZoomLevel(url_, kZoomLevel);
 
-  prefs_->AddPrefObserver(prefs::kPerHostZoomLevels, &pref_observer_);
+  PrefChangeRegistrar registrar;
+  registrar.Init(prefs_);
+  registrar.Add(prefs::kPerHostZoomLevels, &pref_observer_);
   SetPrefObserverExpectation();
   map->ResetToDefaults();
   EXPECT_EQ(0, map->GetZoomLevel(url_));
   EXPECT_EQ(NULL, prefs_->GetDictionary(prefs::kPerHostZoomLevels));
-  prefs_->RemovePrefObserver(prefs::kPerHostZoomLevels, &pref_observer_);
 }
 
 TEST_F(HostZoomMapTest, ReloadOnPrefChange) {
   scoped_refptr<HostZoomMap> map(new HostZoomMap(&profile_));
   map->SetZoomLevel(url_, kZoomLevel);
 
   DictionaryValue dict;
   dict.SetWithoutPathExpansion(host_, Value::CreateIntegerValue(0));
   prefs_->Set(prefs::kPerHostZoomLevels, dict);
   EXPECT_EQ(0, map->GetZoomLevel(url_));
 }
 
 TEST_F(HostZoomMapTest, NoHost) {
   scoped_refptr<HostZoomMap> map(new HostZoomMap(&profile_));
   GURL file_url1_("file:///tmp/test.html");
   GURL file_url2_("file:///tmp/other.html");
   map->SetZoomLevel(file_url1_, kZoomLevel);
 
   EXPECT_EQ(kZoomLevel, map->GetZoomLevel(file_url1_));
   EXPECT_EQ(0, map->GetZoomLevel(file_url2_));
 }