Revert 170483 - Remove PrefObserver usages, batch 12.

chrome/browser/ui/alternate_error_tab_observer.cc

Index: chrome/browser/ui/alternate_error_tab_observer.cc
===================================================================
--- chrome/browser/ui/alternate_error_tab_observer.cc	(revision 170518)
+++ chrome/browser/ui/alternate_error_tab_observer.cc	(working copy)
@@ -25,11 +25,7 @@
   PrefService* prefs = profile_->GetPrefs();
   if (prefs) {
     pref_change_registrar_.Init(prefs);
-    pref_change_registrar_.Add(
-        prefs::kAlternateErrorPagesEnabled,
-        base::Bind(&AlternateErrorPageTabObserver::
-                       OnAlternateErrorPagesEnabledChanged,
-                   base::Unretained(this)));
+    pref_change_registrar_.Add(prefs::kAlternateErrorPagesEnabled, this);
   }
 
   registrar_.Add(this, chrome::NOTIFICATION_GOOGLE_URL_UPDATED,
@@ -65,6 +61,17 @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// PrefObserver overrides
+
+void AlternateErrorPageTabObserver::OnPreferenceChanged(
+    PrefServiceBase* service,
+    const std::string& pref_name) {
+  DCHECK_EQ(profile_->GetPrefs(), service);
+  DCHECK(prefs::kAlternateErrorPagesEnabled == pref_name);
+  UpdateAlternateErrorPageURL(web_contents()->GetRenderViewHost());
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // Internal helpers
 
 GURL AlternateErrorPageTabObserver::GetAlternateErrorPageURL() const {
@@ -83,10 +90,6 @@
   return url;
 }
 
-void AlternateErrorPageTabObserver::OnAlternateErrorPagesEnabledChanged() {
-  UpdateAlternateErrorPageURL(web_contents()->GetRenderViewHost());
-}
-
 void AlternateErrorPageTabObserver::UpdateAlternateErrorPageURL(
     RenderViewHost* rvh) {
   rvh->SetAltErrorPageURL(GetAlternateErrorPageURL());
Property changes on: chrome/browser/ui/alternate_error_tab_observer.cc
___________________________________________________________________
Deleted: svn:mergeinfo