Reland: Closure-based API to PrefChangeObserver and PrefMember.

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 188 matching lines @@
 
 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);
 }
 
 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(), this);
+    local_state_registrar_.Remove(pref_name.c_str());
   else
-    registrar_.Remove(pref_name.c_str(), this);
+    registrar_.Remove(pref_name.c_str());
 }
 
 void CoreOptionsHandler::SetPref(const std::string& pref_name,
                                  const base::Value* value,
                                  const std::string& metric) {
   PrefService* pref_service = FindServiceForPref(pref_name);
   PrefChangeFilterMap::iterator iter = pref_change_filters_.find(pref_name);
   if (iter != pref_change_filters_.end()) {
     // Also check if the pref is user modifiable (don't even try to run the
     // filter function if the user is not allowed to change the pref).
@@ skipping 309 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