Remove PrefObserver usages, batch 13.

chrome/browser/ui/webui/options/startup_pages_handler.cc

 // Copyright (c) 2012 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/ui/webui/options/startup_pages_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
@@ skipping 72 matching lines @@
 }
 
 void StartupPagesHandler::InitializeHandler() {
   Profile* profile = Profile::FromWebUI(web_ui());
 
   startup_custom_pages_table_model_.reset(
       new CustomHomePagesTableModel(profile));
   startup_custom_pages_table_model_->SetObserver(this);
 
   pref_change_registrar_.Init(profile->GetPrefs());
-  pref_change_registrar_.Add(prefs::kURLsToRestoreOnStartup, this);
+  pref_change_registrar_.Add(
+      prefs::kURLsToRestoreOnStartup,
+      base::Bind(&StartupPagesHandler::UpdateStartupPages,
+                 base::Unretained(this)));
 
   autocomplete_controller_.reset(new AutocompleteController(profile, this,
       AutocompleteClassifier::kDefaultOmniboxProviders));
 }
 
 void StartupPagesHandler::InitializePage() {
   UpdateStartupPages();
 }
 
 void StartupPagesHandler::OnModelChanged() {
@@ skipping 19 matching lines @@
 }
 
 void StartupPagesHandler::OnItemsAdded(int start, int length) {
   OnModelChanged();
 }
 
 void StartupPagesHandler::OnItemsRemoved(int start, int length) {
   OnModelChanged();
 }
 
-void StartupPagesHandler::OnPreferenceChanged(PrefServiceBase* service,
-                                              const std::string& pref_name) {
-  if (pref_name == prefs::kURLsToRestoreOnStartup) {
-    UpdateStartupPages();
-  } else {
-    NOTREACHED();
-  }
-}
-
 void StartupPagesHandler::SetStartupPagesToCurrentPages(
     const ListValue* args) {
   startup_custom_pages_table_model_->SetToCurrentlyOpenPages();
 }
 
 void StartupPagesHandler::RemoveStartupPages(const ListValue* args) {
   for (int i = args->GetSize() - 1; i >= 0; --i) {
     std::string string_value;
     CHECK(args->GetString(i, &string_value));
 
@@ skipping 100 matching lines @@
 
 void StartupPagesHandler::OnResultChanged(bool default_match_changed) {
   const AutocompleteResult& result = autocomplete_controller_->result();
   ListValue suggestions;
   OptionsUI::ProcessAutocompleteSuggestions(result, &suggestions);
   web_ui()->CallJavascriptFunction(
       "StartupOverlay.updateAutocompleteSuggestions", suggestions);
 }
 
 }  // namespace options