Remove the last usages of PrefObserver outside of Prefs.

chrome/browser/ui/webui/options/core_options_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/core_options_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 39 matching lines @@
 
 }  // namespace
 
 CoreOptionsHandler::CoreOptionsHandler()
     : handlers_host_(NULL) {
 }
 
 CoreOptionsHandler::~CoreOptionsHandler() {}
 
 void CoreOptionsHandler::InitializeHandler() {
-  plugin_status_pref_setter_.Init(Profile::FromWebUI(web_ui()), this);
+  Profile* profile = Profile::FromWebUI(web_ui());
+
+  plugin_status_pref_setter_.Init(
+      profile,
+      base::Bind(&CoreOptionsHandler::OnPreferenceChanged,
+                 base::Unretained(this),
+                 profile->GetPrefs()));
 
   pref_change_filters_[prefs::kMetricsReportingEnabled] =
       base::Bind(&AllowMetricsReportingChange);
 }
 
 void CoreOptionsHandler::InitializePage() {
   UpdateClearPluginLSOData();
   UpdatePepperFlashSettingsEnabled();
 }
 
@@ skipping 122 matching lines @@
 void CoreOptionsHandler::HandleInitialize(const ListValue* args) {
   DCHECK(handlers_host_);
   handlers_host_->InitializeHandlers();
 }
 
 base::Value* CoreOptionsHandler::FetchPref(const std::string& pref_name) {
   return CreateValueForPref(pref_name, std::string());
 }
 
 void CoreOptionsHandler::ObservePref(const std::string& pref_name) {
-  if (g_browser_process->local_state()->FindPreference(pref_name.c_str()))
-    local_state_registrar_.Add(pref_name.c_str(), this);
-  else
-    registrar_.Add(pref_name.c_str(), this);
+  if (g_browser_process->local_state()->FindPreference(pref_name.c_str())) {
+    local_state_registrar_.Add(
+        pref_name.c_str(),
+        base::Bind(&CoreOptionsHandler::OnPreferenceChanged,
+                   base::Unretained(this),
+                   local_state_registrar_.prefs()));
+  } else {
+    registrar_.Add(
+        pref_name.c_str(),
+        base::Bind(&CoreOptionsHandler::OnPreferenceChanged,
+                   base::Unretained(this),
+                   registrar_.prefs()));
+  }
 }
 
 void CoreOptionsHandler::StopObservingPref(const std::string& pref_name) {
   if (g_browser_process->local_state()->FindPreference(pref_name.c_str()))
     local_state_registrar_.Remove(pref_name.c_str());
   else
     registrar_.Remove(pref_name.c_str());
 }
 
 void CoreOptionsHandler::SetPref(const std::string& pref_name,
@@ skipping 316 matching lines @@
 
 void CoreOptionsHandler::UpdatePepperFlashSettingsEnabled() {
   scoped_ptr<base::Value> enabled(
       base::Value::CreateBooleanValue(
           plugin_status_pref_setter_.IsPepperFlashSettingsEnabled()));
   web_ui()->CallJavascriptFunction(
       "OptionsPage.setPepperFlashSettingsEnabled", *enabled);
 }
 
 }  // namespace options