base::Bind: More converts, mostly in WebUI.

chrome/browser/ui/webui/chromeos/register_page_ui.cc

 // Copyright (c) 2011 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/chromeos/register_page_ui.h"
 
 #include <string>
 
-#include "base/callback.h"
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
@@ skipping 178 matching lines @@
 WebUIMessageHandler* RegisterPageHandler::Attach(WebUI* web_ui) {
   return WebUIMessageHandler::Attach(web_ui);
 }
 
 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
 }
 
 void RegisterPageHandler::HandleGetRegistrationUrl(const ListValue* args) {
 #if defined(OS_CHROMEOS)
   chromeos::StartupCustomizationDocument* customization =
     chromeos::StartupCustomizationDocument::GetInstance();
   if (chromeos::WizardController::default_controller() &&
       customization->IsReady()) {
     const std::string& url = customization->registration_url();
     VLOG(1) << "Loading registration form with URL: " << url;
     GURL register_url(url);
     if (!register_url.is_valid()) {
       SkipRegistration("Registration URL defined in manifest is invalid.");
       return;
     }
     StringValue url_value(url);
     web_ui_->CallJavascriptFunction(kJsApiSetRegistrationUrl, url_value);
   } else {
     SkipRegistration("Startup manifest not defined.");
   }
 #endif
 }
 
 void RegisterPageHandler::HandleGetUserInfo(const ListValue* args) {
 #if defined(OS_CHROMEOS)
   if (chromeos::CrosLibrary::Get()->EnsureLoaded()) {
      version_loader_.GetVersion(
          &version_consumer_,
-         NewCallback(this,
-                     &RegisterPageHandler::OnVersion),
+         base::Bind(&RegisterPageHandler::OnVersion, base::Unretained(this)),
          chromeos::VersionLoader::VERSION_FULL);
   } else {
     SkipRegistration("CrosLibrary is not loaded.");
   }
 #endif
 }
 
 #if defined(OS_CHROMEOS)
 void RegisterPageHandler::OnVersion(chromeos::VersionLoader::Handle handle,
                                     std::string version) {
@@ skipping 54 matching lines @@
 RegisterPageUI::RegisterPageUI(TabContents* contents) : ChromeWebUI(contents) {
   RegisterPageHandler* handler = new RegisterPageHandler();
   AddMessageHandler((handler)->Attach(this));
   handler->Init();
   RegisterPageUIHTMLSource* html_source = new RegisterPageUIHTMLSource();
 
   // Set up the chrome://register/ source.
   Profile* profile = Profile::FromBrowserContext(contents->browser_context());
   profile->GetChromeURLDataManager()->AddDataSource(html_source);
 }