[web-ui] Migrate callbacks to base::Bind.

This CL doesn't migrate all callbacks, just those used with RegisterMessageCallback.

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

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

38 files changed, 373 insertions, 193 deletions

diff --git a/chrome/browser/ui/webui/active_downloads_ui.cc b/chrome/browser/ui/webui/active_downloads_ui.cc
index df60935..e2f78b3 100644
--- a/chrome/browser/ui/webui/active_downloads_ui.cc
+++ b/chrome/browser/ui/webui/active_downloads_ui.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/file_util.h"
 #include "base/logging.h"
@@ -222,17 +223,23 @@ void ActiveDownloadsHandler::Init() {
 
 void ActiveDownloadsHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("getDownloads",
-      NewCallback(this, &ActiveDownloadsHandler::HandleGetDownloads));
+      base::Bind(&ActiveDownloadsHandler::HandleGetDownloads,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("pauseToggleDownload",
-      NewCallback(this, &ActiveDownloadsHandler::HandlePauseToggleDownload));
+      base::Bind(&ActiveDownloadsHandler::HandlePauseToggleDownload,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("cancelDownload",
-      NewCallback(this, &ActiveDownloadsHandler::HandleCancelDownload));
+      base::Bind(&ActiveDownloadsHandler::HandleCancelDownload,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("allowDownload",
-      NewCallback(this, &ActiveDownloadsHandler::HandleAllowDownload));
+      base::Bind(&ActiveDownloadsHandler::HandleAllowDownload,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("openNewFullWindow",
-      NewCallback(this, &ActiveDownloadsHandler::OpenNewFullWindow));
+      base::Bind(&ActiveDownloadsHandler::OpenNewFullWindow,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("playMediaFile",
-      NewCallback(this, &ActiveDownloadsHandler::PlayMediaFile));
+      base::Bind(&ActiveDownloadsHandler::PlayMediaFile,
+                 base::Unretained(this)));
 }
 
 void ActiveDownloadsHandler::PlayMediaFile(const ListValue* args) {
diff --git a/chrome/browser/ui/webui/bug_report_ui.cc b/chrome/browser/ui/webui/bug_report_ui.cc
index 897997f..57b4917 100644
--- a/chrome/browser/ui/webui/bug_report_ui.cc
+++ b/chrome/browser/ui/webui/bug_report_ui.cc
@@ -6,7 +6,9 @@
 
 #include <vector>
 
-#include "base/callback.h"
+#include "base/bind.h"
+#include "base/bind_helpers.h"
+#include "base/callback_old.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
@@ -387,19 +389,25 @@ bool BugReportHandler::Init() {
 
 void BugReportHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("getDialogDefaults",
-      NewCallback(this, &BugReportHandler::HandleGetDialogDefaults));
+      base::Bind(&BugReportHandler::HandleGetDialogDefaults,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("refreshCurrentScreenshot",
-      NewCallback(this, &BugReportHandler::HandleRefreshCurrentScreenshot));
+      base::Bind(&BugReportHandler::HandleRefreshCurrentScreenshot,
+                 base::Unretained(this)));
 #if defined(OS_CHROMEOS)
   web_ui_->RegisterMessageCallback("refreshSavedScreenshots",
-      NewCallback(this, &BugReportHandler::HandleRefreshSavedScreenshots));
+      base::Bind(&BugReportHandler::HandleRefreshSavedScreenshots,
+                 base::Unretained(this)));
 #endif
   web_ui_->RegisterMessageCallback("sendReport",
-      NewCallback(this, &BugReportHandler::HandleSendReport));
+      base::Bind(&BugReportHandler::HandleSendReport,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("cancel",
-      NewCallback(this, &BugReportHandler::HandleCancel));
+      base::Bind(&BugReportHandler::HandleCancel,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("openSystemTab",
-      NewCallback(this, &BugReportHandler::HandleOpenSystemTab));
+      base::Bind(&BugReportHandler::HandleOpenSystemTab,
+                 base::Unretained(this)));
 }
 
 void BugReportHandler::HandleGetDialogDefaults(const ListValue*) {
diff --git a/chrome/browser/ui/webui/certificate_viewer.cc b/chrome/browser/ui/webui/certificate_viewer.cc
index 9349acc..8b27615 100644
--- a/chrome/browser/ui/webui/certificate_viewer.cc
+++ b/chrome/browser/ui/webui/certificate_viewer.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/i18n/time_formatting.h"
 #include "base/utf_string_conversions.h"
 #include "base/string_number_conversions.h"
@@ -120,14 +122,14 @@ CertificateViewerDialogHandler::~CertificateViewerDialogHandler() {
 
 void CertificateViewerDialogHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("exportCertificate",
-      NewCallback(this,
-          &CertificateViewerDialogHandler::ExportCertificate));
+      base::Bind(&CertificateViewerDialogHandler::ExportCertificate,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("requestCertificateInfo",
-      NewCallback(this,
-          &CertificateViewerDialogHandler::RequestCertificateInfo));
+      base::Bind(&CertificateViewerDialogHandler::RequestCertificateInfo,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("requestCertificateFields",
-      NewCallback(this,
-          &CertificateViewerDialogHandler::RequestCertificateFields));
+      base::Bind(&CertificateViewerDialogHandler::RequestCertificateFields,
+                 base::Unretained(this)));
 }
 
 void CertificateViewerDialogHandler::ExportCertificate(
diff --git a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc
index 9e54398..f038f55 100644
--- a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc
@@ -5,6 +5,8 @@
 #include "chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.h"
 #include "chrome/browser/ui/webui/chromeos/imageburner/webui_handler.h"
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "base/task.h"
@@ -184,13 +186,14 @@ WebUIMessageHandler* WebUIHandler::Attach(WebUI* web_ui) {
 
 void WebUIHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("getDevices",
-      NewCallback(this, &WebUIHandler::HandleGetDevices));
+      base::Bind(&WebUIHandler::HandleGetDevices, base::Unretained(this)));
   web_ui_->RegisterMessageCallback("burnImage",
-      NewCallback(this, &WebUIHandler::HandleBurnImage));
+      base::Bind(&WebUIHandler::HandleBurnImage, base::Unretained(this)));
   web_ui_->RegisterMessageCallback("cancelBurnImage",
-      NewCallback(this, &WebUIHandler::HandleCancelBurnImage));
+      base::Bind(&WebUIHandler::HandleCancelBurnImage, base::Unretained(this)));
   web_ui_->RegisterMessageCallback("webuiInitialized",
-      NewCallback(this, &WebUIHandler::HandleWebUIInitialized));
+      base::Bind(&WebUIHandler::HandleWebUIInitialized,
+                 base::Unretained(this)));
 }
 
 void WebUIHandler::DiskChanged(chromeos::MountLibraryEventType event,
diff --git a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
index 7334bf2..50d33bb 100644
--- a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
@@ -4,7 +4,8 @@
 
 #include "chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h"
 
-#include "base/callback.h"
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
@@ -273,9 +274,11 @@ WebUIMessageHandler* KeyboardOverlayHandler::Attach(WebUI* web_ui) {
 void KeyboardOverlayHandler::RegisterMessages() {
   DCHECK(web_ui_);
   web_ui_->RegisterMessageCallback("getInputMethodId",
-      NewCallback(this, &KeyboardOverlayHandler::GetInputMethodId));
+      base::Bind(&KeyboardOverlayHandler::GetInputMethodId,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("getLabelMap",
-      NewCallback(this, &KeyboardOverlayHandler::GetLabelMap));
+      base::Bind(&KeyboardOverlayHandler::GetLabelMap,
+                 base::Unretained(this)));
 }
 
 void KeyboardOverlayHandler::GetInputMethodId(const ListValue* args) {
diff --git a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
index be14100..d85589e 100644
--- a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h"
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/values.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/accessibility_util.h"
@@ -52,9 +54,11 @@ void CoreOobeHandler::Initialize() {
 
 void CoreOobeHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback(kJsApiToggleAccessibility,
-      NewCallback(this, &CoreOobeHandler::OnToggleAccessibility));
+      base::Bind(&CoreOobeHandler::OnToggleAccessibility,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback(kJsApiScreenStateInitialize,
-      NewCallback(this, &CoreOobeHandler::OnInitialized));
+      base::Bind(&CoreOobeHandler::OnInitialized,
+                 base::Unretained(this)));
 }
 
 void CoreOobeHandler::OnInitialized(const base::ListValue* args) {
diff --git a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc
index d501359..65fdd7d 100644
--- a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc
@@ -6,6 +6,8 @@
 
 #include <string>
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/help_app_launcher.h"
 #include "chrome/browser/chromeos/login/webui_login_display.h"
@@ -101,11 +103,12 @@ void EulaScreenHandler::Initialize() {
 
 void EulaScreenHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("eulaOnExit",
-      NewCallback(this, &EulaScreenHandler::HandleOnExit));
+      base::Bind(&EulaScreenHandler::HandleOnExit,base::Unretained(this)));
   web_ui_->RegisterMessageCallback("eulaOnLearnMore",
-      NewCallback(this, &EulaScreenHandler::HandleOnLearnMore));
+      base::Bind(&EulaScreenHandler::HandleOnLearnMore,base::Unretained(this)));
   web_ui_->RegisterMessageCallback("eulaOnTpmPopupOpened",
-      NewCallback(this, &EulaScreenHandler::HandleOnTpmPopupOpened));
+      base::Bind(&EulaScreenHandler::HandleOnTpmPopupOpened,
+                 base::Unretained(this)));
 }
 
 void EulaScreenHandler::OnPasswordFetched(const std::string& tpm_password) {
diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.cc b/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.cc
index 84f6765..d8b1669 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h"
 
+#include "base/bind.h"
+#include "base/bind_helphers.h"
 #include "chrome/browser/chromeos/login/webui_login_display.h"
 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown.h"
 #include "content/browser/webui/web_ui.h"
@@ -39,13 +41,17 @@ void NetworkDropdownHandler::Initialize() {
 
 void NetworkDropdownHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback(kJsApiNetworkItemChosen,
-      NewCallback(this, &NetworkDropdownHandler::HandleNetworkItemChosen));
+      base::Bind(&NetworkDropdownHandler::HandleNetworkItemChosen,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback(kJsApiNetworkDropdownShow,
-      NewCallback(this, &NetworkDropdownHandler::HandleNetworkDropdownShow));
+      base::Bind(&NetworkDropdownHandler::HandleNetworkDropdownShow,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback(kJsApiNetworkDropdownHide,
-      NewCallback(this, &NetworkDropdownHandler::HandleNetworkDropdownHide));
+      base::Bind(&NetworkDropdownHandler::HandleNetworkDropdownHide,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback(kJsApiNetworkDropdownRefresh,
-      NewCallback(this, &NetworkDropdownHandler::HandleNetworkDropdownRefresh));
+      base::Bind(&NetworkDropdownHandler::HandleNetworkDropdownRefresh,
+                 base::Unretained(this)));
 }
 
 void NetworkDropdownHandler::HandleNetworkItemChosen(
diff --git a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
index 85915b3..9e51153 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h"
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ -138,11 +140,13 @@ void NetworkScreenHandler::Initialize() {
 
 void NetworkScreenHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback(kJsApiNetworkOnExit,
-      NewCallback(this, &NetworkScreenHandler::HandleOnExit));
+      base::Bind(&NetworkScreenHandler::HandleOnExit,base::Unretained(this)));
   web_ui_->RegisterMessageCallback(kJsApiNetworkOnLanguageChanged,
-      NewCallback(this, &NetworkScreenHandler::HandleOnLanguageChanged));
+      base::Bind(&NetworkScreenHandler::HandleOnLanguageChanged,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback(kJsApiNetworkOnInputMethodChanged,
-      NewCallback(this, &NetworkScreenHandler::HandleOnInputMethodChanged));
+      base::Bind(&NetworkScreenHandler::HandleOnInputMethodChanged,
+                 base::Unretained(this)));
 }
 
 // NetworkScreenHandler, private: ----------------------------------------------
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
index 057e299..6e9d929 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/hash_tables.h"
 #include "base/stringprintf.h"
@@ -280,37 +282,50 @@ void SigninScreenHandler::RegisterMessages() {
   network_state_informer_.reset(new NetworkStateInformer(web_ui_));
 
   web_ui_->RegisterMessageCallback("authenticateUser",
-      NewCallback(this, &SigninScreenHandler::HandleAuthenticateUser));
+      base::Bind(&SigninScreenHandler::HandleAuthenticateUser,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("completeLogin",
-      NewCallback(this, &SigninScreenHandler::HandleCompleteLogin));
+      base::Bind(&SigninScreenHandler::HandleCompleteLogin,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("getUsers",
-      NewCallback(this, &SigninScreenHandler::HandleGetUsers));
+      base::Bind(&SigninScreenHandler::HandleGetUsers,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("launchIncognito",
-      NewCallback(this, &SigninScreenHandler::HandleLaunchIncognito));
+      base::Bind(&SigninScreenHandler::HandleLaunchIncognito,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("fixCaptivePortal",
-      NewCallback(this, &SigninScreenHandler::HandleFixCaptivePortal));
+      base::Bind(&SigninScreenHandler::HandleFixCaptivePortal,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("showAddUser",
-      NewCallback(this, &SigninScreenHandler::HandleShowAddUser));
+      base::Bind(&SigninScreenHandler::HandleShowAddUser,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("shutdownSystem",
-      NewCallback(this, &SigninScreenHandler::HandleShutdownSystem));
+      base::Bind(&SigninScreenHandler::HandleShutdownSystem,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("removeUser",
-      NewCallback(this, &SigninScreenHandler::HandleRemoveUser));
+      base::Bind(&SigninScreenHandler::HandleRemoveUser,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("toggleEnrollmentScreen",
-      NewCallback(this, &SigninScreenHandler::HandleToggleEnrollmentScreen));
+      base::Bind(&SigninScreenHandler::HandleToggleEnrollmentScreen,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("launchHelpApp",
-      NewCallback(this, &SigninScreenHandler::HandleLaunchHelpApp));
+      base::Bind(&SigninScreenHandler::HandleLaunchHelpApp,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("createAccount",
-      NewCallback(this, &SigninScreenHandler::HandleCreateAccount));
+      base::Bind(&SigninScreenHandler::HandleCreateAccount,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("loginWebuiReady",
-      NewCallback(this, &SigninScreenHandler::HandleLoginWebuiReady));
+      base::Bind(&SigninScreenHandler::HandleLoginWebuiReady,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("loginRequestNetworkState",
-      NewCallback(this, &SigninScreenHandler::HandleLoginRequestNetworkState));
+      base::Bind(&SigninScreenHandler::HandleLoginRequestNetworkState,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("loginAddNetworkStateObserver",
-      NewCallback(this,
-                  &SigninScreenHandler::HandleLoginAddNetworkStateObserver));
+      base::Bind(&SigninScreenHandler::HandleLoginAddNetworkStateObserver,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("loginRemoveNetworkStateObserver",
-      NewCallback(this,
-                  &SigninScreenHandler::HandleLoginRemoveNetworkStateObserver));
+      base::Bind(&SigninScreenHandler::HandleLoginRemoveNetworkStateObserver,
+                 base::Unretained(this)));
 }
 
 void SigninScreenHandler::HandleGetUsers(const base::ListValue* args) {
diff --git a/chrome/browser/ui/webui/chromeos/login/update_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/update_screen_handler.cc
index cb0c3ef..db71515 100644
--- a/chrome/browser/ui/webui/chromeos/login/update_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/update_screen_handler.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/webui/chromeos/login/update_screen_handler.h"
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "grit/chromium_strings.h"
@@ -105,9 +107,9 @@ void UpdateScreenHandler::ShowPreparingUpdatesInfo(bool visible) {
 
 void UpdateScreenHandler::RegisterMessages() {
 #if !defined(OFFICIAL_BUILD)
-  web_ui_->RegisterMessageCallback(
-      "cancelUpdate",
-      NewCallback(this, &UpdateScreenHandler::HandleUpdateCancel));
+  web_ui_->RegisterMessageCallback("cancelUpdate",
+      base::Bind(&UpdateScreenHandler::HandleUpdateCancel,
+                 base::Unretained(this)));
 #endif
 }
 
diff --git a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
index 0ed45344..8d13525 100644
--- a/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc
@@ -4,7 +4,8 @@
 
 #include "chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h"
 
-#include "base/callback.h"
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/default_user_images.h"
@@ -117,15 +118,15 @@ void UserImageScreenHandler::AddProfileImage(const SkBitmap& image) {
 }
 
 void UserImageScreenHandler::RegisterMessages() {
-  web_ui_->RegisterMessageCallback(
-      "takePhoto",
-      NewCallback(this, &UserImageScreenHandler::HandleTakePhoto));
-  web_ui_->RegisterMessageCallback(
-      "selectImage",
-      NewCallback(this, &UserImageScreenHandler::HandleSelectImage));
-  web_ui_->RegisterMessageCallback(
-      "onUserImageAccepted",
-      NewCallback(this, &UserImageScreenHandler::HandleImageAccepted));
+  web_ui_->RegisterMessageCallback("takePhoto",
+      base::Bind(this, &UserImageScreenHandler::HandleTakePhoto,
+                 base::Unretained(this)));
+  web_ui_->RegisterMessageCallback("selectImage",
+      base::Bind(this, &UserImageScreenHandler::HandleSelectImage,
+                 base::Unretained(this)));
+  web_ui_->RegisterMessageCallback("onUserImageAccepted",
+      base::Bind(this, &UserImageScreenHandler::HandleImageAccepted,
+                 base::Unretained(this)));
 }
 
 void UserImageScreenHandler::OnPhotoAccepted(const SkBitmap& photo) {
diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
index 2f088a1..d598682 100644
--- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
@@ -8,7 +8,8 @@
 #include <map>
 #include <string>
 
-#include "base/callback.h"
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ -484,9 +485,11 @@ void MobileSetupHandler::Init(TabContents* contents) {
 
 void MobileSetupHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback(kJsApiStartActivation,
-      NewCallback(this, &MobileSetupHandler::HandleStartActivation));
+      base::Bind(&MobileSetupHandler::HandleStartActivation,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback(kJsApiSetTransactionStatus,
-      NewCallback(this, &MobileSetupHandler::HandleSetTransactionStatus));
+      base::Bind(&MobileSetupHandler::HandleSetTransactionStatus,
+                 base::Unretained(this)));
 }
 
 void MobileSetupHandler::OnNetworkManagerChanged(
diff --git a/chrome/browser/ui/webui/chromeos/register_page_ui.cc b/chrome/browser/ui/webui/chromeos/register_page_ui.cc
index 19768ce..2fb243e 100644
--- a/chrome/browser/ui/webui/chromeos/register_page_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/register_page_ui.cc
@@ -6,6 +6,8 @@
 
 #include <string>
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
@@ -205,9 +207,11 @@ void RegisterPageHandler::Init() {
 void RegisterPageHandler::RegisterMessages() {
 #if defined(OS_CHROMEOS)
   web_ui_->RegisterMessageCallback(kJsCallbackGetRegistrationUrl,
-      NewCallback(this, &RegisterPageHandler::HandleGetRegistrationUrl));
+      base::Bind(&RegisterPageHandler::HandleGetRegistrationUrl,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback(kJsCallbackUserInfo,
-      NewCallback(this, &RegisterPageHandler::HandleGetUserInfo));
+      base::Bind(&RegisterPageHandler::HandleGetUserInfo,
+                 base::Unretained(this)));
 #endif
 }
 
diff --git a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc
index 67ce735..bbaa405 100644
--- a/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc
@@ -6,6 +6,8 @@
 
 #include <string>
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string_piece.h"
@@ -344,17 +346,23 @@ void SimUnlockHandler::Init(TabContents* contents) {
 
 void SimUnlockHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback(kJsApiCancel,
-        NewCallback(this, &SimUnlockHandler::HandleCancel));
+      base::Bind(&SimUnlockHandler::HandleCancel,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback(kJsApiChangePinCode,
-      NewCallback(this, &SimUnlockHandler::HandleChangePinCode));
+      base::Bind(&SimUnlockHandler::HandleChangePinCode,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback(kJsApiEnterPinCode,
-      NewCallback(this, &SimUnlockHandler::HandleEnterPinCode));
+      base::Bind(&SimUnlockHandler::HandleEnterPinCode,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback(kJsApiEnterPukCode,
-      NewCallback(this, &SimUnlockHandler::HandleEnterPukCode));
+      base::Bind(&SimUnlockHandler::HandleEnterPukCode,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback(kJsApiProceedToPukInput,
-      NewCallback(this, &SimUnlockHandler::HandleProceedToPukInput));
+      base::Bind(&SimUnlockHandler::HandleProceedToPukInput,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback(kJsApiSimStatusInitialize,
-      NewCallback(this, &SimUnlockHandler::HandleSimStatusInitialize));
+      base::Bind(&SimUnlockHandler::HandleSimStatusInitialize,
+                 base::Unretained(this)));
 }
 
 void SimUnlockHandler::OnNetworkDeviceSimLockChanged(
diff --git a/chrome/browser/ui/webui/collected_cookies_ui_delegate.cc b/chrome/browser/ui/webui/collected_cookies_ui_delegate.cc
index df55ddc..6ad7c74 100644
--- a/chrome/browser/ui/webui/collected_cookies_ui_delegate.cc
+++ b/chrome/browser/ui/webui/collected_cookies_ui_delegate.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/webui/collected_cookies_ui_delegate.h"
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/values.h"
@@ -211,13 +213,17 @@ bool CollectedCookiesUIDelegate::ShouldShowDialogTitle() const {
 
 void CollectedCookiesUIDelegate::RegisterMessages() {
   web_ui_->RegisterMessageCallback("BindCookiesTreeModel",
-      NewCallback(this, &CollectedCookiesUIDelegate::BindCookiesTreeModel));
+      base::Bind(&CollectedCookiesUIDelegate::BindCookiesTreeModel,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("Block",
-      NewCallback(this, &CollectedCookiesUIDelegate::Block));
+      base::Bind(&CollectedCookiesUIDelegate::Block,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("Allow",
-      NewCallback(this, &CollectedCookiesUIDelegate::Allow));
+      base::Bind(&CollectedCookiesUIDelegate::Allow,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("AllowThisSession",
-      NewCallback(this, &CollectedCookiesUIDelegate::AllowThisSession));
+      base::Bind(&CollectedCookiesUIDelegate::AllowThisSession,
+                 base::Unretained(this)));
 
   allowed_cookies_adapter_.Init(web_ui_);
   blocked_cookies_adapter_.Init(web_ui_);
diff --git a/chrome/browser/ui/webui/constrained_html_ui.cc b/chrome/browser/ui/webui/constrained_html_ui.cc
index 5621339..988d963 100644
--- a/chrome/browser/ui/webui/constrained_html_ui.cc
+++ b/chrome/browser/ui/webui/constrained_html_ui.cc
@@ -7,6 +7,8 @@
 #include <string>
 #include <vector>
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/lazy_instance.h"
 #include "base/values.h"
 #include "chrome/browser/ui/webui/html_dialog_ui.h"
@@ -41,7 +43,8 @@ void ConstrainedHtmlUI::RenderViewCreated(RenderViewHost* render_view_host) {
 
   // Add a "DialogClose" callback which matches HTMLDialogUI behavior.
   RegisterMessageCallback("DialogClose",
-      NewCallback(this, &ConstrainedHtmlUI::OnDialogCloseMessage));
+      base::Bind(&ConstrainedHtmlUI::OnDialogCloseMessage,
+                 base::Unretained(this)));
 }
 
 void ConstrainedHtmlUI::OnDialogCloseMessage(const ListValue* args) {
diff --git a/chrome/browser/ui/webui/cookies_tree_model_adapter.cc b/chrome/browser/ui/webui/cookies_tree_model_adapter.cc
index fdfcc20..099d883 100644
--- a/chrome/browser/ui/webui/cookies_tree_model_adapter.cc
+++ b/chrome/browser/ui/webui/cookies_tree_model_adapter.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/webui/cookies_tree_model_adapter.h"
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
@@ -38,7 +40,8 @@ void CookiesTreeModelAdapter::Init(WebUI* web_ui) {
   web_ui_ = web_ui;
 
   web_ui_->RegisterMessageCallback(GetRequestChildrenCallbackName(this),
-      NewCallback(this, &CookiesTreeModelAdapter::RequestChildren));
+      base::Bind(&CookiesTreeModelAdapter::RequestChildren,
+                 base::Unretained(this)));
 }
 
 void CookiesTreeModelAdapter::Bind(const std::string& tree_id,
diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/crashes_ui.cc
index a3c1389..3012fb0 100644
--- a/chrome/browser/ui/webui/crashes_ui.cc
+++ b/chrome/browser/ui/webui/crashes_ui.cc
@@ -6,6 +6,8 @@
 
 #include <vector>
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/i18n/time_formatting.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/utf_string_conversions.h"
@@ -105,7 +107,8 @@ WebUIMessageHandler* CrashesDOMHandler::Attach(WebUI* web_ui) {
 
 void CrashesDOMHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("requestCrashList",
-      NewCallback(this, &CrashesDOMHandler::HandleRequestCrashes));
+      base::Bind(&CrashesDOMHandler::HandleRequestCrashes,
+                 base::Unretained(this)));
 }
 
 void CrashesDOMHandler::HandleRequestCrashes(const ListValue* args) {
diff --git a/chrome/browser/ui/webui/downloads_dom_handler.cc b/chrome/browser/ui/webui/downloads_dom_handler.cc
index 861e288..6d12be0 100644
--- a/chrome/browser/ui/webui/downloads_dom_handler.cc
+++ b/chrome/browser/ui/webui/downloads_dom_handler.cc
@@ -8,7 +8,8 @@
 #include <functional>
 
 #include "base/basictypes.h"
-#include "base/callback.h"
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
 #include "base/string_piece.h"
@@ -143,31 +144,41 @@ void DownloadsDOMHandler::Init() {
 
 void DownloadsDOMHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("getDownloads",
-      NewCallback(this, &DownloadsDOMHandler::HandleGetDownloads));
+      base::Bind(&DownloadsDOMHandler::HandleGetDownloads,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("openFile",
-      NewCallback(this, &DownloadsDOMHandler::HandleOpenFile));
-
+      base::Bind(&DownloadsDOMHandler::HandleOpenFile,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("drag",
-      NewCallback(this, &DownloadsDOMHandler::HandleDrag));
-
+      base::Bind(&DownloadsDOMHandler::HandleDrag,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("saveDangerous",
-      NewCallback(this, &DownloadsDOMHandler::HandleSaveDangerous));
+      base::Bind(&DownloadsDOMHandler::HandleSaveDangerous,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("discardDangerous",
-      NewCallback(this, &DownloadsDOMHandler::HandleDiscardDangerous));
+      base::Bind(&DownloadsDOMHandler::HandleDiscardDangerous,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("show",
-      NewCallback(this, &DownloadsDOMHandler::HandleShow));
+      base::Bind(&DownloadsDOMHandler::HandleShow,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("togglepause",
-      NewCallback(this, &DownloadsDOMHandler::HandlePause));
+      base::Bind(&DownloadsDOMHandler::HandlePause,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("resume",
-      NewCallback(this, &DownloadsDOMHandler::HandlePause));
+      base::Bind(&DownloadsDOMHandler::HandlePause,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("remove",
-      NewCallback(this, &DownloadsDOMHandler::HandleRemove));
+      base::Bind(&DownloadsDOMHandler::HandleRemove,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("cancel",
-      NewCallback(this, &DownloadsDOMHandler::HandleCancel));
+      base::Bind(&DownloadsDOMHandler::HandleCancel,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("clearAll",
-      NewCallback(this, &DownloadsDOMHandler::HandleClearAll));
+      base::Bind(&DownloadsDOMHandler::HandleClearAll,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("openDownloadsFolder",
-      NewCallback(this, &DownloadsDOMHandler::HandleOpenDownloadsFolder));
+      base::Bind(&DownloadsDOMHandler::HandleOpenDownloadsFolder,
+                 base::Unretained(this)));
 }
 
 void DownloadsDOMHandler::OnDownloadUpdated(DownloadItem* download) {
diff --git a/chrome/browser/ui/webui/flags_ui.cc b/chrome/browser/ui/webui/flags_ui.cc
index f50ab17..cfea285 100644
--- a/chrome/browser/ui/webui/flags_ui.cc
+++ b/chrome/browser/ui/webui/flags_ui.cc
@@ -6,6 +6,8 @@
 
 #include <string>
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/about_flags.h"
@@ -101,11 +103,14 @@ class FlagsDOMHandler : public WebUIMessageHandler {
 
 void FlagsDOMHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("requestFlagsExperiments",
-      NewCallback(this, &FlagsDOMHandler::HandleRequestFlagsExperiments));
+      base::Bind(&FlagsDOMHandler::HandleRequestFlagsExperiments,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("enableFlagsExperiment",
-      NewCallback(this, &FlagsDOMHandler::HandleEnableFlagsExperimentMessage));
+      base::Bind(&FlagsDOMHandler::HandleEnableFlagsExperimentMessage,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("restartBrowser",
-      NewCallback(this, &FlagsDOMHandler::HandleRestartBrowser));
+      base::Bind(&FlagsDOMHandler::HandleRestartBrowser,
+                 base::Unretained(this)));
 }
 
 void FlagsDOMHandler::HandleRequestFlagsExperiments(const ListValue* args) {
diff --git a/chrome/browser/ui/webui/flash_ui.cc b/chrome/browser/ui/webui/flash_ui.cc
index 4359787..0dd1076 100644
--- a/chrome/browser/ui/webui/flash_ui.cc
+++ b/chrome/browser/ui/webui/flash_ui.cc
@@ -8,6 +8,9 @@
 #include <string>
 #include <vector>
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
+#include "base/callback_old.h"
 #include "base/i18n/time_formatting.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
@@ -142,7 +145,8 @@ FlashDOMHandler::FlashDOMHandler()
 
 void FlashDOMHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("requestFlashInfo",
-      NewCallback(this, &FlashDOMHandler::HandleRequestFlashInfo));
+      base::Bind(&FlashDOMHandler::HandleRequestFlashInfo,
+                 base::Unretained(this)));
 }
 
 void FlashDOMHandler::OnCrashListAvailable() {
diff --git a/chrome/browser/ui/webui/gpu_internals_ui.cc b/chrome/browser/ui/webui/gpu_internals_ui.cc
index 3d8049a..733b627 100644
--- a/chrome/browser/ui/webui/gpu_internals_ui.cc
+++ b/chrome/browser/ui/webui/gpu_internals_ui.cc
@@ -6,6 +6,9 @@
 
 #include <string>
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
+#include "base/callback_old.h"
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
@@ -102,12 +105,12 @@ WebUIMessageHandler* GpuMessageHandler::Attach(WebUI* web_ui) {
 void GpuMessageHandler::RegisterMessages() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  web_ui_->RegisterMessageCallback(
-      "browserBridgeInitialized",
-      NewCallback(this, &GpuMessageHandler::OnBrowserBridgeInitialized));
-  web_ui_->RegisterMessageCallback(
-      "callAsync",
-      NewCallback(this, &GpuMessageHandler::OnCallAsync));
+  web_ui_->RegisterMessageCallback("browserBridgeInitialized",
+      base::Bind(&GpuMessageHandler::OnBrowserBridgeInitialized,
+                 base::Unretained(this)));
+  web_ui_->RegisterMessageCallback("callAsync",
+      base::Bind(&GpuMessageHandler::OnCallAsync,
+                 base::Unretained(this)));
 }
 
 void GpuMessageHandler::OnCallAsync(const ListValue* args) {
diff --git a/chrome/browser/ui/webui/history2_ui.cc b/chrome/browser/ui/webui/history2_ui.cc
index da87afb..7b80a82 100644
--- a/chrome/browser/ui/webui/history2_ui.cc
+++ b/chrome/browser/ui/webui/history2_ui.cc
@@ -6,7 +6,9 @@
 
 #include <set>
 
-#include "base/callback.h"
+#include "base/bind.h"
+#include "base/bind_helpers.h"
+#include "base/callback_old.h"
 #include "base/i18n/time_formatting.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
@@ -112,13 +114,17 @@ WebUIMessageHandler* BrowsingHistoryHandler2::Attach(WebUI* web_ui) {
 
 void BrowsingHistoryHandler2::RegisterMessages() {
   web_ui_->RegisterMessageCallback("getHistory",
-      NewCallback(this, &BrowsingHistoryHandler2::HandleGetHistory));
+      base::Bind(&BrowsingHistoryHandler2::HandleGetHistory,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("searchHistory",
-      NewCallback(this, &BrowsingHistoryHandler2::HandleSearchHistory));
+      base::Bind(&BrowsingHistoryHandler2::HandleSearchHistory,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("removeURLsOnOneDay",
-      NewCallback(this, &BrowsingHistoryHandler2::HandleRemoveURLsOnOneDay));
+      base::Bind(&BrowsingHistoryHandler2::HandleRemoveURLsOnOneDay,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("clearBrowsingData",
-      NewCallback(this, &BrowsingHistoryHandler2::HandleClearBrowsingData));
+      base::Bind(&BrowsingHistoryHandler2::HandleClearBrowsingData,
+                 base::Unretained(this)));
 }
 
 void BrowsingHistoryHandler2::HandleGetHistory(const ListValue* args) {
diff --git a/chrome/browser/ui/webui/history_ui.cc b/chrome/browser/ui/webui/history_ui.cc
index a88e8c8..f88d4db 100644
--- a/chrome/browser/ui/webui/history_ui.cc
+++ b/chrome/browser/ui/webui/history_ui.cc
@@ -7,7 +7,9 @@
 #include <algorithm>
 #include <set>
 
-#include "base/callback.h"
+#include "base/bind.h"
+#include "base/bind_helpers.h"
+#include "base/callback_old.h"
 #include "base/i18n/time_formatting.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
@@ -143,13 +145,17 @@ WebUIMessageHandler* BrowsingHistoryHandler::Attach(WebUI* web_ui) {
 
 void BrowsingHistoryHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("getHistory",
-      NewCallback(this, &BrowsingHistoryHandler::HandleGetHistory));
+      base::Bind(&BrowsingHistoryHandler::HandleGetHistory,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("searchHistory",
-      NewCallback(this, &BrowsingHistoryHandler::HandleSearchHistory));
+      base::Bind(&BrowsingHistoryHandler::HandleSearchHistory,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("removeURLsOnOneDay",
-      NewCallback(this, &BrowsingHistoryHandler::HandleRemoveURLsOnOneDay));
+      base::Bind(&BrowsingHistoryHandler::HandleRemoveURLsOnOneDay,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("clearBrowsingData",
-      NewCallback(this, &BrowsingHistoryHandler::HandleClearBrowsingData));
+      base::Bind(&BrowsingHistoryHandler::HandleClearBrowsingData,
+                 base::Unretained(this)));
 }
 
 void BrowsingHistoryHandler::HandleGetHistory(const ListValue* args) {
diff --git a/chrome/browser/ui/webui/html_dialog_ui.cc b/chrome/browser/ui/webui/html_dialog_ui.cc
index d21825c..d6dc51a5 100644
--- a/chrome/browser/ui/webui/html_dialog_ui.cc
+++ b/chrome/browser/ui/webui/html_dialog_ui.cc
@@ -4,7 +4,8 @@
 
 #include "chrome/browser/ui/webui/html_dialog_ui.h"
 
-#include "base/callback.h"
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/lazy_instance.h"
 #include "base/values.h"
 #include "chrome/common/chrome_notification_types.h"
@@ -47,7 +48,7 @@ void HtmlDialogUI::RenderViewCreated(RenderViewHost* render_view_host) {
   // Hook up the javascript function calls, also known as chrome.send("foo")
   // calls in the HTML, to the actual C++ functions.
   RegisterMessageCallback("DialogClose",
-                          NewCallback(this, &HtmlDialogUI::OnDialogClosed));
+      base::Bind(&HtmlDialogUI::OnDialogClosed, base::Unretained(this)));
 
   // Pass the arguments to the renderer supplied by the delegate.
   std::string dialog_args;
diff --git a/chrome/browser/ui/webui/hung_renderer_dialog.cc b/chrome/browser/ui/webui/hung_renderer_dialog.cc
index 13379cd..307b2c6 100644
--- a/chrome/browser/ui/webui/hung_renderer_dialog.cc
+++ b/chrome/browser/ui/webui/hung_renderer_dialog.cc
@@ -7,6 +7,8 @@
 #include <string>
 #include <vector>
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/json/json_reader.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ -175,8 +177,8 @@ void HungRendererDialogHandler::CloseDialog() {
 
 void HungRendererDialogHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("requestTabContentsList",
-      NewCallback(this,
-          &HungRendererDialogHandler::RequestTabContentsList));
+      base::Bind(&HungRendererDialogHandler::RequestTabContentsList,
+                 base::Unretained(this)));
 }
 
 void HungRendererDialogHandler::RequestTabContentsList(
diff --git a/chrome/browser/ui/webui/media/media_internals_handler.cc b/chrome/browser/ui/webui/media/media_internals_handler.cc
index bd8f753..e664786 100644
--- a/chrome/browser/ui/webui/media/media_internals_handler.cc
+++ b/chrome/browser/ui/webui/media/media_internals_handler.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/webui/media/media_internals_handler.h"
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/webui/media/media_internals_proxy.h"
@@ -28,9 +30,9 @@ WebUIMessageHandler* MediaInternalsMessageHandler::Attach(WebUI* web_ui) {
 void MediaInternalsMessageHandler::RegisterMessages() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  web_ui_->RegisterMessageCallback(
-      "getEverything",
-      NewCallback(this, &MediaInternalsMessageHandler::OnGetEverything));
+  web_ui_->RegisterMessageCallback("getEverything",
+      base::Bind(&MediaInternalsMessageHandler::OnGetEverything,
+                 base::Unretained(this)));
 }
 
 void MediaInternalsMessageHandler::OnGetEverything(const ListValue* list) {
diff --git a/chrome/browser/ui/webui/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview_handler.cc
index a1f69cf..0a55492 100644
--- a/chrome/browser/ui/webui/print_preview_handler.cc
+++ b/chrome/browser/ui/webui/print_preview_handler.cc
@@ -10,6 +10,8 @@
 #include <vector>
 
 #include "base/base64.h"
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #if !defined(OS_CHROMEOS)
 #include "base/command_line.h"
 #endif
@@ -554,35 +556,50 @@ PrintPreviewHandler::~PrintPreviewHandler() {
 
 void PrintPreviewHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("getDefaultPrinter",
-      NewCallback(this, &PrintPreviewHandler::HandleGetDefaultPrinter));
+      base::Bind(&PrintPreviewHandler::HandleGetDefaultPrinter,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("getPrinters",
-      NewCallback(this, &PrintPreviewHandler::HandleGetPrinters));
+      base::Bind(&PrintPreviewHandler::HandleGetPrinters,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("getPreview",
-      NewCallback(this, &PrintPreviewHandler::HandleGetPreview));
+      base::Bind(&PrintPreviewHandler::HandleGetPreview,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("print",
-      NewCallback(this, &PrintPreviewHandler::HandlePrint));
+      base::Bind(&PrintPreviewHandler::HandlePrint,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("getPrinterCapabilities",
-      NewCallback(this, &PrintPreviewHandler::HandleGetPrinterCapabilities));
+      base::Bind(&PrintPreviewHandler::HandleGetPrinterCapabilities,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("showSystemDialog",
-      NewCallback(this, &PrintPreviewHandler::HandleShowSystemDialog));
+      base::Bind(&PrintPreviewHandler::HandleShowSystemDialog,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("signIn",
-      NewCallback(this, &PrintPreviewHandler::HandleSignin));
+      base::Bind(&PrintPreviewHandler::HandleSignin,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("manageCloudPrinters",
-      NewCallback(this, &PrintPreviewHandler::HandleManageCloudPrint));
+      base::Bind(&PrintPreviewHandler::HandleManageCloudPrint,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("manageLocalPrinters",
-      NewCallback(this, &PrintPreviewHandler::HandleManagePrinters));
+      base::Bind(&PrintPreviewHandler::HandleManagePrinters,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("reloadCrashedInitiatorTab",
-      NewCallback(this, &PrintPreviewHandler::HandleReloadCrashedInitiatorTab));
+      base::Bind(&PrintPreviewHandler::HandleReloadCrashedInitiatorTab,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("closePrintPreviewTab",
-      NewCallback(this, &PrintPreviewHandler::HandleClosePreviewTab));
+      base::Bind(&PrintPreviewHandler::HandleClosePreviewTab,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("hidePreview",
-      NewCallback(this, &PrintPreviewHandler::HandleHidePreview));
+      base::Bind(&PrintPreviewHandler::HandleHidePreview,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("cancelPendingPrintRequest",
-      NewCallback(this, &PrintPreviewHandler::HandleCancelPendingPrintRequest));
+      base::Bind(&PrintPreviewHandler::HandleCancelPendingPrintRequest,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("saveLastPrinter",
-      NewCallback(this, &PrintPreviewHandler::HandleSaveLastPrinter));
+      base::Bind(&PrintPreviewHandler::HandleSaveLastPrinter,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("getInitiatorTabTitle",
-      NewCallback(this, &PrintPreviewHandler::HandleGetInitiatorTabTitle));
+      base::Bind(&PrintPreviewHandler::HandleGetInitiatorTabTitle,
+                 base::Unretained(this)));
 }
 
 TabContentsWrapper* PrintPreviewHandler::preview_tab_wrapper() const {
diff --git a/chrome/browser/ui/webui/quota_internals_handler.cc b/chrome/browser/ui/webui/quota_internals_handler.cc
index bb874de..7657ab1 100644
--- a/chrome/browser/ui/webui/quota_internals_handler.cc
+++ b/chrome/browser/ui/webui/quota_internals_handler.cc
@@ -6,6 +6,8 @@
 
 #include <string>
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/quota_internals_proxy.h"
@@ -23,9 +25,9 @@ QuotaInternalsHandler::~QuotaInternalsHandler() {
 
 void QuotaInternalsHandler::RegisterMessages() {
   DCHECK(web_ui_);
-  web_ui_->RegisterMessageCallback(
-      "requestInfo",
-      NewCallback(this, &QuotaInternalsHandler::OnRequestInfo));
+  web_ui_->RegisterMessageCallback("requestInfo",
+      base::Bind(&QuotaInternalsHandler::OnRequestInfo,
+                 base::Unretained(this)));
 }
 
 void QuotaInternalsHandler::ReportAvailableSpace(int64 available_space) {
diff --git a/chrome/browser/ui/webui/sessions_ui.cc b/chrome/browser/ui/webui/sessions_ui.cc
index bed4e2c..055b487 100644
--- a/chrome/browser/ui/webui/sessions_ui.cc
+++ b/chrome/browser/ui/webui/sessions_ui.cc
@@ -7,6 +7,8 @@
 #include <algorithm>
 #include <vector>
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/glue/session_model_associator.h"
 #include "chrome/browser/sync/glue/synced_session.h"
@@ -111,7 +113,8 @@ WebUIMessageHandler* SessionsDOMHandler::Attach(WebUI* web_ui) {
 
 void SessionsDOMHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("requestSessionList",
-      NewCallback(this, &SessionsDOMHandler::HandleRequestSessions));
+      base::Bind(&SessionsDOMHandler::HandleRequestSessions,
+                 base::Unretained(this)));
 }
 
 void SessionsDOMHandler::HandleRequestSessions(const ListValue* args) {
diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc
index 80fcc50..9ef3623 100644
--- a/chrome/browser/ui/webui/sync_setup_handler.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/webui/sync_setup_handler.h"
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/utf_string_conversions.h"
@@ -324,24 +326,31 @@ void SyncSetupHandler::OnGetOAuthTokenFailure(
   CloseSyncSetup();
 }
 
-
 void SyncSetupHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("SyncSetupDidClosePage",
-      NewCallback(this, &SyncSetupHandler::OnDidClosePage));
+      base::Bind(&SyncSetupHandler::OnDidClosePage,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("SyncSetupSubmitAuth",
-      NewCallback(this, &SyncSetupHandler::HandleSubmitAuth));
+      base::Bind(&SyncSetupHandler::HandleSubmitAuth,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("SyncSetupConfigure",
-      NewCallback(this, &SyncSetupHandler::HandleConfigure));
+      base::Bind(&SyncSetupHandler::HandleConfigure,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("SyncSetupPassphrase",
-      NewCallback(this, &SyncSetupHandler::HandlePassphraseEntry));
+      base::Bind(&SyncSetupHandler::HandlePassphraseEntry,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("SyncSetupPassphraseCancel",
-      NewCallback(this, &SyncSetupHandler::HandlePassphraseCancel));
+      base::Bind(&SyncSetupHandler::HandlePassphraseCancel,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("SyncSetupAttachHandler",
-      NewCallback(this, &SyncSetupHandler::HandleAttachHandler));
+      base::Bind(&SyncSetupHandler::HandleAttachHandler,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("SyncSetupShowErrorUI",
-      NewCallback(this, &SyncSetupHandler::HandleShowErrorUI));
+      base::Bind(&SyncSetupHandler::HandleShowErrorUI,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("SyncSetupShowSetupUI",
-      NewCallback(this, &SyncSetupHandler::HandleShowSetupUI));
+      base::Bind(&SyncSetupHandler::HandleShowSetupUI,
+                 base::Unretained(this)));
 }
 
 // Ideal(?) solution here would be to mimic the ClientLogin overlay.  Since
diff --git a/chrome/browser/ui/webui/task_manager_handler.cc b/chrome/browser/ui/webui/task_manager_handler.cc
index 9bd513e..d31192a 100644
--- a/chrome/browser/ui/webui/task_manager_handler.cc
+++ b/chrome/browser/ui/webui/task_manager_handler.cc
@@ -6,6 +6,8 @@
 
 #include <algorithm>
 #include <functional>
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
@@ -297,13 +299,17 @@ void TaskManagerHandler::Init() {
 
 void TaskManagerHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("killProcess",
-      NewCallback(this, &TaskManagerHandler::HandleKillProcess));
+      base::Bind(&TaskManagerHandler::HandleKillProcess,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("openAboutMemory",
-      NewCallback(this, &TaskManagerHandler::OpenAboutMemory));
+      base::Bind(&TaskManagerHandler::OpenAboutMemory,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("enableTaskManager",
-      NewCallback(this, &TaskManagerHandler::EnableTaskManager));
+      base::Bind(&TaskManagerHandler::EnableTaskManager,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback("disableTaskManager",
-      NewCallback(this, &TaskManagerHandler::DisableTaskManager));
+      base::Bind(&TaskManagerHandler::DisableTaskManager,
+                 base::Unretained(this)));
 }
 
 void TaskManagerHandler::HandleKillProcess(const ListValue* indexes) {
diff --git a/chrome/browser/ui/webui/textfields_ui.cc b/chrome/browser/ui/webui/textfields_ui.cc
index 8ec4404..58ba465 100644
--- a/chrome/browser/ui/webui/textfields_ui.cc
+++ b/chrome/browser/ui/webui/textfields_ui.cc
@@ -7,6 +7,8 @@
 #include <algorithm>
 #include <string>
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/memory/singleton.h"
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
@@ -45,7 +47,8 @@ TextfieldsDOMHandler::TextfieldsDOMHandler() : WebUIMessageHandler() {}
 
 void TextfieldsDOMHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("textfieldValue",
-      NewCallback(this, &TextfieldsDOMHandler::HandleTextfieldValue));
+      base::Bind(&TextfieldsDOMHandler::HandleTextfieldValue,
+                 base::Unretained(this)));
 }
 
 void TextfieldsDOMHandler::HandleTextfieldValue(const ListValue* args) {
diff --git a/chrome/browser/ui/webui/tracing_ui.cc b/chrome/browser/ui/webui/tracing_ui.cc
index 2ff09d6..fd60dda 100644
--- a/chrome/browser/ui/webui/tracing_ui.cc
+++ b/chrome/browser/ui/webui/tracing_ui.cc
@@ -6,6 +6,9 @@
 
 #include <string>
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
+#include "base/callback_old.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
@@ -168,26 +171,24 @@ WebUIMessageHandler* TracingMessageHandler::Attach(WebUI* web_ui) {
 void TracingMessageHandler::RegisterMessages() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  web_ui_->RegisterMessageCallback(
-      "tracingControllerInitialized",
-      NewCallback(this,
-                  &TracingMessageHandler::OnTracingControllerInitialized));
-  web_ui_->RegisterMessageCallback(
-      "beginTracing",
-      NewCallback(this, &TracingMessageHandler::OnBeginTracing));
-  web_ui_->RegisterMessageCallback(
-      "endTracingAsync",
-      NewCallback(this, &TracingMessageHandler::OnEndTracingAsync));
-  web_ui_->RegisterMessageCallback(
-      "beginRequestBufferPercentFull",
-      NewCallback(this,
-                  &TracingMessageHandler::OnBeginRequestBufferPercentFull));
-  web_ui_->RegisterMessageCallback(
-      "loadTraceFile",
-      NewCallback(this, &TracingMessageHandler::OnLoadTraceFile));
-  web_ui_->RegisterMessageCallback(
-      "saveTraceFile",
-      NewCallback(this, &TracingMessageHandler::OnSaveTraceFile));
+  web_ui_->RegisterMessageCallback("tracingControllerInitialized",
+      base::Bind(&TracingMessageHandler::OnTracingControllerInitialized,
+                 base::Unretained(this)));
+  web_ui_->RegisterMessageCallback("beginTracing",
+      base::Bind(&TracingMessageHandler::OnBeginTracing,
+                 base::Unretained(this)));
+  web_ui_->RegisterMessageCallback("endTracingAsync",
+      base::Bind(&TracingMessageHandler::OnEndTracingAsync,
+                 base::Unretained(this)));
+  web_ui_->RegisterMessageCallback("beginRequestBufferPercentFull",
+      base::Bind(&TracingMessageHandler::OnBeginRequestBufferPercentFull,
+                 base::Unretained(this)));
+  web_ui_->RegisterMessageCallback("loadTraceFile",
+      base::Bind(&TracingMessageHandler::OnLoadTraceFile,
+                 base::Unretained(this)));
+  web_ui_->RegisterMessageCallback("saveTraceFile",
+      base::Bind(&TracingMessageHandler::OnSaveTraceFile,
+                 base::Unretained(this)));
 }
 
 void TracingMessageHandler::OnTracingControllerInitialized(
diff --git a/chrome/browser/ui/webui/web_ui_browsertest.cc b/chrome/browser/ui/webui/web_ui_browsertest.cc
index 7c09b95..6b89c81 100644
--- a/chrome/browser/ui/webui/web_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/web_ui_browsertest.cc
@@ -6,6 +6,8 @@
 #include <string>
 #include <vector>
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/lazy_instance.h"
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
@@ -464,14 +466,18 @@ class WebUIBrowserAsyncTest : public WebUIBrowserTest {
 
    private:
     virtual void RegisterMessages() OVERRIDE {
-      web_ui_->RegisterMessageCallback("startAsyncTest", NewCallback(
-          this, &AsyncWebUIMessageHandler::HandleStartAsyncTest));
-      web_ui_->RegisterMessageCallback("testContinues", NewCallback(
-          this, &AsyncWebUIMessageHandler::HandleTestContinues));
-      web_ui_->RegisterMessageCallback("testFails", NewCallback(
-          this, &AsyncWebUIMessageHandler::HandleTestFails));
-      web_ui_->RegisterMessageCallback("testPasses", NewCallback(
-          this, &AsyncWebUIMessageHandler::HandleTestPasses));
+      web_ui_->RegisterMessageCallback("startAsyncTest",
+          base::Bind(&AsyncWebUIMessageHandler::HandleStartAsyncTest,
+                     base::Unretained(this)));
+      web_ui_->RegisterMessageCallback("testContinues",
+          base::Bind(&AsyncWebUIMessageHandler::HandleTestContinues,
+                     base::Unretained(this)));
+      web_ui_->RegisterMessageCallback("testFails",
+          base::Bind(&AsyncWebUIMessageHandler::HandleTestFails,
+                     base::Unretained(this)));
+      web_ui_->RegisterMessageCallback("testPasses",
+          base::Bind(&AsyncWebUIMessageHandler::HandleTestPasses,
+                     base::Unretained(this)));
     }
 
     // Starts the test in |list_value|[0] with the runAsync wrapper.
diff --git a/chrome/browser/ui/webui/web_ui_test_handler.cc b/chrome/browser/ui/webui/web_ui_test_handler.cc
index 0767583..223e50b 100644
--- a/chrome/browser/ui/webui/web_ui_test_handler.cc
+++ b/chrome/browser/ui/webui/web_ui_test_handler.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/webui/web_ui_test_handler.h"
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/render_messages.h"
@@ -47,8 +49,8 @@ bool WebUITestHandler::RunJavaScriptTestWithResult(const string16& js_text) {
 }
 
 void WebUITestHandler::RegisterMessages() {
-  web_ui_->RegisterMessageCallback("testResult", NewCallback(
-      this, &WebUITestHandler::HandleTestResult));
+  web_ui_->RegisterMessageCallback("testResult",
+      base::Bind(&WebUITestHandler::HandleTestResult, base::Unretained(this)));
 }
 
 void WebUITestHandler::HandleTestResult(const ListValue* test_result) {
diff --git a/chrome/browser/ui/webui/workers_ui.cc b/chrome/browser/ui/webui/workers_ui.cc
index 3fddfdd..01f4cba 100644
--- a/chrome/browser/ui/webui/workers_ui.cc
+++ b/chrome/browser/ui/webui/workers_ui.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/webui/workers_ui.h"
 
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/json/json_writer.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/string_number_conversions.h"
@@ -107,7 +109,8 @@ class WorkersDOMHandler : public WebUIMessageHandler {
 
 void WorkersDOMHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback(kOpenDevToolsCommand,
-      NewCallback(this, &WorkersDOMHandler::HandleOpenDevTools));
+      base::Bind(&WorkersDOMHandler::HandleOpenDevTools,
+                 base::Unretained(this)));
 }
 
 void WorkersDOMHandler::HandleOpenDevTools(const ListValue* args) {