[dom-ui settings] Migrate message callbacks to base::Bind().

BUG=98478
Review URL: http://codereview.chromium.org/8098008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103563 0039d316-1c4b-4281-b951-d872f2087c98

12 files changed, 167 insertions, 119 deletions

diff --git a/chrome/browser/ui/webui/options/advanced_options_handler.cc b/chrome/browser/ui/webui/options/advanced_options_handler.cc
index bb1a745..d11e630 100644
--- a/chrome/browser/ui/webui/options/advanced_options_handler.cc
+++ b/chrome/browser/ui/webui/options/advanced_options_handler.cc
@@ -7,7 +7,8 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/callback.h"
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ -255,46 +256,47 @@ void AdvancedOptionsHandler::RegisterMessages() {
   // Setup handlers specific to this panel.
   DCHECK(web_ui_);
   web_ui_->RegisterMessageCallback("selectDownloadLocation",
-      NewCallback(this,
-                  &AdvancedOptionsHandler::HandleSelectDownloadLocation));
+      base::Bind(&AdvancedOptionsHandler::HandleSelectDownloadLocation,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("autoOpenFileTypesAction",
-      NewCallback(this,
-                  &AdvancedOptionsHandler::HandleAutoOpenButton));
+      base::Bind(&AdvancedOptionsHandler::HandleAutoOpenButton,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("defaultFontSizeAction",
-      NewCallback(this, &AdvancedOptionsHandler::HandleDefaultFontSize));
+      base::Bind(&AdvancedOptionsHandler::HandleDefaultFontSize,
+                 base::Unretained(this)));
 #if !defined(OS_CHROMEOS)
   web_ui_->RegisterMessageCallback("metricsReportingCheckboxAction",
-      NewCallback(this,
-                  &AdvancedOptionsHandler::HandleMetricsReportingCheckbox));
+      base::Bind(&AdvancedOptionsHandler::HandleMetricsReportingCheckbox,
+                 base::Unretained(this)));
 #endif
 #if !defined(USE_NSS) && !defined(USE_OPENSSL)
   web_ui_->RegisterMessageCallback("showManageSSLCertificates",
-      NewCallback(this,
-                  &AdvancedOptionsHandler::ShowManageSSLCertificates));
+      base::Bind(&AdvancedOptionsHandler::ShowManageSSLCertificates,
+                 base::Unretained(this)));
 #endif
   web_ui_->RegisterMessageCallback("showCloudPrintManagePage",
-      NewCallback(this,
-                  &AdvancedOptionsHandler::ShowCloudPrintManagePage));
+      base::Bind(&AdvancedOptionsHandler::ShowCloudPrintManagePage,
+                 base::Unretained(this)));
 #if !defined(OS_CHROMEOS)
   if (cloud_print_proxy_ui_enabled_) {
     web_ui_->RegisterMessageCallback("showCloudPrintSetupDialog",
-        NewCallback(this,
-                    &AdvancedOptionsHandler::ShowCloudPrintSetupDialog));
+        base::Bind(&AdvancedOptionsHandler::ShowCloudPrintSetupDialog,
+                   base::Unretained(this)));
     web_ui_->RegisterMessageCallback("disableCloudPrintProxy",
-        NewCallback(this,
-                    &AdvancedOptionsHandler::HandleDisableCloudPrintProxy));
+        base::Bind(&AdvancedOptionsHandler::HandleDisableCloudPrintProxy,
+                   base::Unretained(this)));
   }
   web_ui_->RegisterMessageCallback("showNetworkProxySettings",
-      NewCallback(this,
-                  &AdvancedOptionsHandler::ShowNetworkProxySettings));
+      base::Bind(&AdvancedOptionsHandler::ShowNetworkProxySettings,
+                 base::Unretained(this)));
 #endif
   web_ui_->RegisterMessageCallback("checkRevocationCheckboxAction",
-      NewCallback(this,
-                  &AdvancedOptionsHandler::HandleCheckRevocationCheckbox));
+      base::Bind(&AdvancedOptionsHandler::HandleCheckRevocationCheckbox,
+                 base::Unretained(this)));
 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
   web_ui_->RegisterMessageCallback("backgroundModeAction",
-      NewCallback(this,
-                  &AdvancedOptionsHandler::HandleBackgroundModeCheckbox));
+      base::Bind(&AdvancedOptionsHandler::HandleBackgroundModeCheckbox,
+                 base::Unretained(this)));
 #endif
 }
 
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index f051719..b5ae3f5 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -5,6 +5,8 @@
 #include "chrome/browser/ui/webui/options/browser_options_handler.h"
 
 #include "base/basictypes.h"
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/string_number_conversions.h"
@@ -93,46 +95,45 @@ void BrowserOptionsHandler::GetLocalizedValues(
 }
 
 void BrowserOptionsHandler::RegisterMessages() {
-  web_ui_->RegisterMessageCallback(
-      "setHomePage",
-      NewCallback(this, &BrowserOptionsHandler::SetHomePage));
-  web_ui_->RegisterMessageCallback(
-      "becomeDefaultBrowser",
-      NewCallback(this, &BrowserOptionsHandler::BecomeDefaultBrowser));
-  web_ui_->RegisterMessageCallback(
-      "setDefaultSearchEngine",
-      NewCallback(this, &BrowserOptionsHandler::SetDefaultSearchEngine));
-  web_ui_->RegisterMessageCallback(
-      "removeStartupPages",
-      NewCallback(this, &BrowserOptionsHandler::RemoveStartupPages));
-  web_ui_->RegisterMessageCallback(
-      "addStartupPage",
-      NewCallback(this, &BrowserOptionsHandler::AddStartupPage));
-  web_ui_->RegisterMessageCallback(
-      "editStartupPage",
-      NewCallback(this, &BrowserOptionsHandler::EditStartupPage));
-  web_ui_->RegisterMessageCallback(
-      "setStartupPagesToCurrentPages",
-      NewCallback(this, &BrowserOptionsHandler::SetStartupPagesToCurrentPages));
-  web_ui_->RegisterMessageCallback(
-      "dragDropStartupPage",
-      NewCallback(this, &BrowserOptionsHandler::DragDropStartupPage));
-  web_ui_->RegisterMessageCallback(
-      "requestAutocompleteSuggestions",
-      NewCallback(this,
-                  &BrowserOptionsHandler::RequestAutocompleteSuggestions));
-  web_ui_->RegisterMessageCallback(
-      "toggleShowBookmarksBar",
-      NewCallback(this, &BrowserOptionsHandler::ToggleShowBookmarksBar));
-  web_ui_->RegisterMessageCallback(
-      "enableInstant",
-      NewCallback(this, &BrowserOptionsHandler::EnableInstant));
-  web_ui_->RegisterMessageCallback(
-      "disableInstant",
-      NewCallback(this, &BrowserOptionsHandler::DisableInstant));
-  web_ui_->RegisterMessageCallback(
-      "getInstantFieldTrialStatus",
-      NewCallback(this, &BrowserOptionsHandler::GetInstantFieldTrialStatus));
+  web_ui_->RegisterMessageCallback("setHomePage",
+      base::Bind(&BrowserOptionsHandler::SetHomePage,
+                 base::Unretained(this)));
+  web_ui_->RegisterMessageCallback("becomeDefaultBrowser",
+      base::Bind(&BrowserOptionsHandler::BecomeDefaultBrowser,
+                 base::Unretained(this)));
+  web_ui_->RegisterMessageCallback("setDefaultSearchEngine",
+      base::Bind(&BrowserOptionsHandler::SetDefaultSearchEngine,
+                 base::Unretained(this)));
+  web_ui_->RegisterMessageCallback("removeStartupPages",
+      base::Bind(&BrowserOptionsHandler::RemoveStartupPages,
+                 base::Unretained(this)));
+  web_ui_->RegisterMessageCallback("addStartupPage",
+      base::Bind(&BrowserOptionsHandler::AddStartupPage,
+                 base::Unretained(this)));
+  web_ui_->RegisterMessageCallback("editStartupPage",
+      base::Bind(&BrowserOptionsHandler::EditStartupPage,
+                 base::Unretained(this)));
+  web_ui_->RegisterMessageCallback("setStartupPagesToCurrentPages",
+      base::Bind(&BrowserOptionsHandler::SetStartupPagesToCurrentPages,
+                 base::Unretained(this)));
+  web_ui_->RegisterMessageCallback("dragDropStartupPage",
+      base::Bind(&BrowserOptionsHandler::DragDropStartupPage,
+                 base::Unretained(this)));
+  web_ui_->RegisterMessageCallback("requestAutocompleteSuggestions",
+      base::Bind(&BrowserOptionsHandler::RequestAutocompleteSuggestions,
+                 base::Unretained(this)));
+  web_ui_->RegisterMessageCallback("toggleShowBookmarksBar",
+      base::Bind(&BrowserOptionsHandler::ToggleShowBookmarksBar,
+                 base::Unretained(this)));
+  web_ui_->RegisterMessageCallback("enableInstant",
+      base::Bind(&BrowserOptionsHandler::EnableInstant,
+                 base::Unretained(this)));
+  web_ui_->RegisterMessageCallback("disableInstant",
+      base::Bind(&BrowserOptionsHandler::DisableInstant,
+                 base::Unretained(this)));
+  web_ui_->RegisterMessageCallback("getInstantFieldTrialStatus",
+      base::Bind(&BrowserOptionsHandler::GetInstantFieldTrialStatus,
+                 base::Unretained(this)));
 }
 
 void BrowserOptionsHandler::Initialize() {
diff --git a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
index 91ca136f..c422356 100644
--- a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
+++ b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
@@ -5,6 +5,8 @@
 #include "chrome/browser/ui/webui/options/clear_browser_data_handler.h"
 
 #include "base/basictypes.h"
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/string16.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
@@ -86,7 +88,8 @@ void ClearBrowserDataHandler::RegisterMessages() {
   // Setup handlers specific to this panel.
   DCHECK(web_ui_);
   web_ui_->RegisterMessageCallback("performClearBrowserData",
-      NewCallback(this, &ClearBrowserDataHandler::HandleClearBrowserData));
+      base::Bind(&ClearBrowserDataHandler::HandleClearBrowserData,
+                 base::Unretained(this)));
 }
 
 void ClearBrowserDataHandler::HandleClearBrowserData(const ListValue* value) {
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc
index 8c19d79..8cf4471 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
@@ -8,7 +8,8 @@
 #include <string>
 #include <vector>
 
-#include "base/callback.h"
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ -596,17 +597,17 @@ void ContentSettingsHandler::UpdateExceptionsViewFromOTRHostContentSettingsMap(
 
 void ContentSettingsHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("setContentFilter",
-      NewCallback(this,
-                  &ContentSettingsHandler::SetContentFilter));
+      base::Bind(&ContentSettingsHandler::SetContentFilter,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("removeException",
-      NewCallback(this,
-                  &ContentSettingsHandler::RemoveException));
+      base::Bind(&ContentSettingsHandler::RemoveException,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("setException",
-      NewCallback(this,
-                  &ContentSettingsHandler::SetException));
+      base::Bind(&ContentSettingsHandler::SetException,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("checkExceptionPatternValidity",
-      NewCallback(this,
-                  &ContentSettingsHandler::CheckExceptionPatternValidity));
+      base::Bind(&ContentSettingsHandler::CheckExceptionPatternValidity,
+                 base::Unretained(this)));
 }
 
 void ContentSettingsHandler::SetContentFilter(const ListValue* args) {
diff --git a/chrome/browser/ui/webui/options/cookies_view_handler.cc b/chrome/browser/ui/webui/options/cookies_view_handler.cc
index 536391f..9050b98 100644
--- a/chrome/browser/ui/webui/options/cookies_view_handler.cc
+++ b/chrome/browser/ui/webui/options/cookies_view_handler.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/webui/options/cookies_view_handler.h"
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browsing_data_appcache_helper.h"
@@ -77,13 +79,17 @@ void CookiesViewHandler::GetLocalizedValues(
 
 void CookiesViewHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("updateCookieSearchResults",
-      NewCallback(this, &CookiesViewHandler::UpdateSearchResults));
+      base::Bind(&CookiesViewHandler::UpdateSearchResults,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("removeAllCookies",
-      NewCallback(this, &CookiesViewHandler::RemoveAll));
+      base::Bind(&CookiesViewHandler::RemoveAll,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("removeCookie",
-      NewCallback(this, &CookiesViewHandler::Remove));
+      base::Bind(&CookiesViewHandler::Remove,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("loadCookie",
-      NewCallback(this, &CookiesViewHandler::LoadChildren));
+      base::Bind(&CookiesViewHandler::LoadChildren,
+                 base::Unretained(this)));
 }
 
 void CookiesViewHandler::TreeNodesAdded(ui::TreeModel* model,
diff --git a/chrome/browser/ui/webui/options/core_options_handler.cc b/chrome/browser/ui/webui/options/core_options_handler.cc
index 12d0b71..ac5b872 100644
--- a/chrome/browser/ui/webui/options/core_options_handler.cc
+++ b/chrome/browser/ui/webui/options/core_options_handler.cc
@@ -4,6 +4,8 @@
 
 #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"
 #include "base/string16.h"
@@ -136,25 +138,35 @@ void CoreOptionsHandler::Observe(int type,
 
 void CoreOptionsHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("coreOptionsInitialize",
-      NewCallback(this, &CoreOptionsHandler::HandleInitialize));
+      base::Bind(&CoreOptionsHandler::HandleInitialize,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("fetchPrefs",
-      NewCallback(this, &CoreOptionsHandler::HandleFetchPrefs));
+      base::Bind(&CoreOptionsHandler::HandleFetchPrefs,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("observePrefs",
-      NewCallback(this, &CoreOptionsHandler::HandleObservePrefs));
+      base::Bind(&CoreOptionsHandler::HandleObservePrefs,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("setBooleanPref",
-      NewCallback(this, &CoreOptionsHandler::HandleSetBooleanPref));
+      base::Bind(&CoreOptionsHandler::HandleSetBooleanPref,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("setIntegerPref",
-      NewCallback(this, &CoreOptionsHandler::HandleSetIntegerPref));
+      base::Bind(&CoreOptionsHandler::HandleSetIntegerPref,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("setDoublePref",
-      NewCallback(this, &CoreOptionsHandler::HandleSetDoublePref));
+      base::Bind(&CoreOptionsHandler::HandleSetDoublePref,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("setStringPref",
-      NewCallback(this, &CoreOptionsHandler::HandleSetStringPref));
+      base::Bind(&CoreOptionsHandler::HandleSetStringPref,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("setListPref",
-      NewCallback(this, &CoreOptionsHandler::HandleSetListPref));
+      base::Bind(&CoreOptionsHandler::HandleSetListPref,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("clearPref",
-      NewCallback(this, &CoreOptionsHandler::HandleClearPref));
+      base::Bind(&CoreOptionsHandler::HandleClearPref,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("coreOptionsUserMetricsAction",
-      NewCallback(this, &CoreOptionsHandler::HandleUserMetricsAction));
+      base::Bind(&CoreOptionsHandler::HandleUserMetricsAction,
+                 base::Unretained(this)));
 }
 
 void CoreOptionsHandler::HandleInitialize(const ListValue* args) {
diff --git a/chrome/browser/ui/webui/options/extension_settings_handler.cc b/chrome/browser/ui/webui/options/extension_settings_handler.cc
index 8445547..30c71bd 100644
--- a/chrome/browser/ui/webui/options/extension_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/extension_settings_handler.cc
@@ -6,6 +6,8 @@
 
 #include "base/auto_reset.h"
 #include "base/base64.h"
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ -92,36 +94,44 @@ void ExtensionSettingsHandler::RegisterUserPrefs(PrefService* prefs) {
 
 void ExtensionSettingsHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("extensionSettingsRequestExtensionsData",
-      NewCallback(this,
-                  &ExtensionSettingsHandler::HandleRequestExtensionsData));
+      base::Bind(&ExtensionSettingsHandler::HandleRequestExtensionsData,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("extensionSettingsToggleDeveloperMode",
-      NewCallback(this, &ExtensionSettingsHandler::HandleToggleDeveloperMode));
+      base::Bind(&ExtensionSettingsHandler::HandleToggleDeveloperMode,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("extensionSettingsInspect",
-      NewCallback(this, &ExtensionSettingsHandler::HandleInspectMessage));
+      base::Bind(&ExtensionSettingsHandler::HandleInspectMessage,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("extensionSettingsReload",
-      NewCallback(this, &ExtensionSettingsHandler::HandleReloadMessage));
+      base::Bind(&ExtensionSettingsHandler::HandleReloadMessage,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("extensionSettingsEnable",
-      NewCallback(this,
-                  &ExtensionSettingsHandler::HandleEnableMessage));
+      base::Bind(&ExtensionSettingsHandler::HandleEnableMessage,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("extensionSettingsEnableIncognito",
-      NewCallback(this,
-                  &ExtensionSettingsHandler::HandleEnableIncognitoMessage));
+      base::Bind(&ExtensionSettingsHandler::HandleEnableIncognitoMessage,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("extensionSettingsAllowFileAccess",
-      NewCallback(this,
-                  &ExtensionSettingsHandler::HandleAllowFileAccessMessage));
+      base::Bind(&ExtensionSettingsHandler::HandleAllowFileAccessMessage,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("extensionSettingsUninstall",
-      NewCallback(this, &ExtensionSettingsHandler::HandleUninstallMessage));
+      base::Bind(&ExtensionSettingsHandler::HandleUninstallMessage,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("extensionSettingsOptions",
-      NewCallback(this, &ExtensionSettingsHandler::HandleOptionsMessage));
+      base::Bind(&ExtensionSettingsHandler::HandleOptionsMessage,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("extensionSettingsShowButton",
-      NewCallback(this, &ExtensionSettingsHandler::HandleShowButtonMessage));
+      base::Bind(&ExtensionSettingsHandler::HandleShowButtonMessage,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("extensionSettingsLoad",
-      NewCallback(this, &ExtensionSettingsHandler::HandleLoadMessage));
+      base::Bind(&ExtensionSettingsHandler::HandleLoadMessage,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("extensionSettingsAutoupdate",
-      NewCallback(this, &ExtensionSettingsHandler::HandleAutoUpdateMessage));
+      base::Bind(&ExtensionSettingsHandler::HandleAutoUpdateMessage,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("extensionSettingsSelectFilePath",
-      NewCallback(this,
-                  &ExtensionSettingsHandler::HandleSelectFilePathMessage));
+      base::Bind(&ExtensionSettingsHandler::HandleSelectFilePathMessage,
+                 base::Unretained(this)));
 }
 
 void ExtensionSettingsHandler::HandleRequestExtensionsData(
diff --git a/chrome/browser/ui/webui/options/font_settings_handler.cc b/chrome/browser/ui/webui/options/font_settings_handler.cc
index 49f6d38..64157302 100644
--- a/chrome/browser/ui/webui/options/font_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/font_settings_handler.cc
@@ -8,6 +8,7 @@
 
 #include "base/basictypes.h"
 #include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/i18n/rtl.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
@@ -98,12 +99,14 @@ WebUIMessageHandler* FontSettingsHandler::Attach(WebUI* web_ui) {
 
 void FontSettingsHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("fetchFontsData",
-      NewCallback(this, &FontSettingsHandler::HandleFetchFontsData));
+      base::Bind(&FontSettingsHandler::HandleFetchFontsData,
+                 base::Unretained(this)));
 }
 
 void FontSettingsHandler::HandleFetchFontsData(const ListValue* args) {
   content::GetFontListAsync(
-      base::Bind(&FontSettingsHandler::FontsListHasLoaded, AsWeakPtr()));
+      base::Bind(&FontSettingsHandler::FontsListHasLoaded,
+                 base::Unretained(this)));
 }
 
 void FontSettingsHandler::FontsListHasLoaded(
diff --git a/chrome/browser/ui/webui/options/font_settings_handler.h b/chrome/browser/ui/webui/options/font_settings_handler.h
index b460010..5fc38f1 100644
--- a/chrome/browser/ui/webui/options/font_settings_handler.h
+++ b/chrome/browser/ui/webui/options/font_settings_handler.h
@@ -6,14 +6,12 @@
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_FONT_SETTINGS_HANDLER_H_
 #pragma once
 
-#include "base/memory/weak_ptr.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
 #include "content/browser/font_list_async.h"
 
 // Font settings overlay page UI handler.
-class FontSettingsHandler : public base::SupportsWeakPtr<FontSettingsHandler>,
-                            public OptionsPageUIHandler {
+class FontSettingsHandler : public OptionsPageUIHandler {
  public:
   FontSettingsHandler();
   virtual ~FontSettingsHandler();
diff --git a/chrome/browser/ui/webui/options/handler_options_handler.cc b/chrome/browser/ui/webui/options/handler_options_handler.cc
index 440ff23..c0002d7 100644
--- a/chrome/browser/ui/webui/options/handler_options_handler.cc
+++ b/chrome/browser/ui/webui/options/handler_options_handler.cc
@@ -6,6 +6,8 @@
 
 #include <vector>
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ -51,15 +53,20 @@ void HandlerOptionsHandler::Initialize() {
 void HandlerOptionsHandler::RegisterMessages() {
   DCHECK(web_ui_);
   web_ui_->RegisterMessageCallback("clearDefault",
-      NewCallback(this, &HandlerOptionsHandler::ClearDefault));
+      base::Bind(&HandlerOptionsHandler::ClearDefault,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("removeHandler",
-      NewCallback(this, &HandlerOptionsHandler::RemoveHandler));
+      base::Bind(&HandlerOptionsHandler::RemoveHandler,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("setHandlersEnabled",
-      NewCallback(this, &HandlerOptionsHandler::SetHandlersEnabled));
+      base::Bind(&HandlerOptionsHandler::SetHandlersEnabled,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("setDefault",
-      NewCallback(this, &HandlerOptionsHandler::SetDefault));
+      base::Bind(&HandlerOptionsHandler::SetDefault,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("removeIgnoredHandler",
-      NewCallback(this, &HandlerOptionsHandler::RemoveIgnoredHandler));
+      base::Bind(&HandlerOptionsHandler::RemoveIgnoredHandler,
+                 base::Unretained(this)));
 }
 
 ProtocolHandlerRegistry* HandlerOptionsHandler::GetProtocolHandlerRegistry() {
diff --git a/chrome/browser/ui/webui/options/import_data_handler.cc b/chrome/browser/ui/webui/options/import_data_handler.cc
index a463b2a..de4f38a 100644
--- a/chrome/browser/ui/webui/options/import_data_handler.cc
+++ b/chrome/browser/ui/webui/options/import_data_handler.cc
@@ -7,7 +7,8 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/callback.h"
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
@@ -63,8 +64,8 @@ void ImportDataHandler::Initialize() {
 }
 
 void ImportDataHandler::RegisterMessages() {
-  web_ui_->RegisterMessageCallback(
-      "importData", NewCallback(this, &ImportDataHandler::ImportData));
+  web_ui_->RegisterMessageCallback("importData",
+      base::Bind(&ImportDataHandler::ImportData, base::Unretained(this)));
 }
 
 void ImportDataHandler::ImportData(const ListValue* args) {
diff --git a/chrome/browser/ui/webui/options/manage_profile_handler.cc b/chrome/browser/ui/webui/options/manage_profile_handler.cc
index 45f9d612..dd4bbb1 100644
--- a/chrome/browser/ui/webui/options/manage_profile_handler.cc
+++ b/chrome/browser/ui/webui/options/manage_profile_handler.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/webui/options/manage_profile_handler.h"
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/value_conversions.h"
@@ -48,9 +50,11 @@ void ManageProfileHandler::Initialize() {
 
 void ManageProfileHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("setProfileNameAndIcon",
-      NewCallback(this, &ManageProfileHandler::SetProfileNameAndIcon));
+      base::Bind(&ManageProfileHandler::SetProfileNameAndIcon,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("deleteProfile",
-      NewCallback(this, &ManageProfileHandler::DeleteProfile));
+      base::Bind(&ManageProfileHandler::DeleteProfile,
+                 base::Unretained(this)));
 }
 
 void ManageProfileHandler::Observe(int type,