Use PrefChangeRegistrar everywhere

chrome/browser/views/options/general_page_view.cc

Index: chrome/browser/views/options/general_page_view.cc
diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc
index 830dac14601d51ad9542ff2721672648863daf6d..d618770cb6466d3585aa5898f4ea57912a0066da 100644
--- a/chrome/browser/views/options/general_page_view.cc
+++ b/chrome/browser/views/options/general_page_view.cc
@@ -217,9 +217,6 @@ GeneralPageView::GeneralPageView(Profile* profile)
 }
 
 GeneralPageView::~GeneralPageView() {
-  profile()->GetPrefs()->RemovePrefObserver(prefs::kRestoreOnStartup, this);
-  profile()->GetPrefs()->RemovePrefObserver(
-      prefs::kURLsToRestoreOnStartup, this);
   if (startup_custom_pages_table_)
     startup_custom_pages_table_->SetModel(NULL);
   default_browser_worker_->ObserverDestroyed();
@@ -356,8 +353,9 @@ void GeneralPageView::InitControlLayout() {
 #endif
 
   // Register pref observers that update the controls when a pref changes.
-  profile()->GetPrefs()->AddPrefObserver(prefs::kRestoreOnStartup, this);
-  profile()->GetPrefs()->AddPrefObserver(prefs::kURLsToRestoreOnStartup, this);
+  registrar_.Init(profile()->GetPrefs());
+  registrar_.Add(prefs::kRestoreOnStartup, this);
+  registrar_.Add(prefs::kURLsToRestoreOnStartup, this);
 
   new_tab_page_is_home_page_.Init(prefs::kHomePageIsNewTabPage,
       profile()->GetPrefs(), this);