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

chrome/browser/ui/webui/net_internals_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/net_internals_ui.h"
 
 #include <algorithm>
 #include <list>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/base64.h"
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/string_piece.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 464 matching lines @@
   }
 
   WebUIMessageHandler* result = WebUIMessageHandler::Attach(web_ui);
   return result;
 }
 
 void NetInternalsMessageHandler::RegisterMessages() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   web_ui_->RegisterMessageCallback(
       "notifyReady",
-      NewCallback(this, &NetInternalsMessageHandler::OnRendererReady));
+      base::Bind(&NetInternalsMessageHandler::OnRendererReady,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback(
       "getProxySettings",
       proxy_->CreateCallback(&IOThreadImpl::OnGetProxySettings));
   web_ui_->RegisterMessageCallback(
       "reloadProxySettings",
       proxy_->CreateCallback(&IOThreadImpl::OnReloadProxySettings));
   web_ui_->RegisterMessageCallback(
       "getBadProxies",
       proxy_->CreateCallback(&IOThreadImpl::OnGetBadProxies));
   web_ui_->RegisterMessageCallback(
@@ skipping 43 matching lines @@
       proxy_->CreateCallback(
           &IOThreadImpl::OnGetSpdyAlternateProtocolMappings));
 #ifdef OS_WIN
   web_ui_->RegisterMessageCallback(
       "getServiceProviders",
       proxy_->CreateCallback(&IOThreadImpl::OnGetServiceProviders));
 #endif
 #ifdef OS_CHROMEOS
   web_ui_->RegisterMessageCallback(
       "refreshSystemLogs",
-      NewCallback(this, &NetInternalsMessageHandler::OnRefreshSystemLogs));
+      base::Bind(&NetInternalsMessageHandler::OnRefreshSystemLogs,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback(
       "getSystemLog",
-      NewCallback(this, &NetInternalsMessageHandler::OnGetSystemLog));
+      base::Bind(&NetInternalsMessageHandler::OnGetSystemLog,
+                 base::Unretained(this)));
 #endif
   web_ui_->RegisterMessageCallback(
       "setLogLevel",
       proxy_->CreateCallback(&IOThreadImpl::OnSetLogLevel));
   web_ui_->RegisterMessageCallback(
       "enableHttpThrottling",
-      NewCallback(this, &NetInternalsMessageHandler::OnEnableHttpThrottling));
+      base::Bind(&NetInternalsMessageHandler::OnEnableHttpThrottling,
+                 base::Unretained(this)));
   web_ui_->RegisterMessageCallback(
       "getPrerenderInfo",
-      NewCallback(this, &NetInternalsMessageHandler::OnGetPrerenderInfo));
+      base::Bind(&NetInternalsMessageHandler::OnGetPrerenderInfo,
+                 base::Unretained(this)));
 }
 
 void NetInternalsMessageHandler::SendJavascriptCommand(
     const std::wstring& command,
     Value* arg) {
   scoped_ptr<Value> command_value(
       Value::CreateStringValue(WideToASCII(command)));
   scoped_ptr<Value> value(arg);
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (value.get()) {
@@ skipping 115 matching lines @@
 }
 
 void NetInternalsMessageHandler::SystemLogsGetter::LoadSystemLogs() {
   if (logs_requested_ || !syslogs_provider_)
     return;
   logs_requested_ = true;
   syslogs_request_id_ = syslogs_provider_->RequestSyslogs(
       false,  // compress logs.
       chromeos::system::SyslogsProvider::SYSLOGS_NETWORK,
       &consumer_,
-      NewCallback(
-          this,
-          &NetInternalsMessageHandler::SystemLogsGetter::OnSystemLogsLoaded));
+      base::Bind(
+          &NetInternalsMessageHandler::SystemLogsGetter::OnSystemLogsLoaded,
+          base::Unretained(this)));
 }
 
 void NetInternalsMessageHandler::SystemLogsGetter::OnSystemLogsLoaded(
     chromeos::system::LogDictionaryType* sys_info,
     std::string* ignored_content) {
   DCHECK(!ignored_content);
   logs_.reset(sys_info);
   logs_received_ = true;
   for (std::list<SystemLogRequest>::iterator request_it = requests_.begin();
        request_it != requests_.end();
@@ skipping 832 matching lines @@
   return constants_dict;
 }
 
 NetInternalsUI::NetInternalsUI(TabContents* contents) : ChromeWebUI(contents) {
   AddMessageHandler((new NetInternalsMessageHandler())->Attach(this));
 
   // Set up the chrome://net-internals/ source.
   GetProfile()->GetChromeURLDataManager()->AddDataSource(
       CreateNetInternalsHTMLSource());
 }