diff options
author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-22 00:55:29 +0000 |
---|---|---|
committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-22 00:55:29 +0000 |
commit | 900c3b296e6b5d68a65efc7959ebe6e20e780ad0 (patch) | |
tree | f0c6d2b2d9de1aa83c83fef8e4f69435839b580a /chrome/browser/debugger | |
parent | cdb948cfd67af825bf14523751db5ec78d817ad3 (diff) | |
download | chromium_src-900c3b296e6b5d68a65efc7959ebe6e20e780ad0.zip chromium_src-900c3b296e6b5d68a65efc7959ebe6e20e780ad0.tar.gz chromium_src-900c3b296e6b5d68a65efc7959ebe6e20e780ad0.tar.bz2 |
base::Bind: Convert chrome/browser/debugger.
BUG=none
TEST=none
R=csilv@chromium.org
Review URL: http://codereview.chromium.org/8375009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106824 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/debugger')
4 files changed, 25 insertions, 21 deletions
diff --git a/chrome/browser/debugger/devtools_file_util.cc b/chrome/browser/debugger/devtools_file_util.cc index 1e4217d..d436117 100644 --- a/chrome/browser/debugger/devtools_file_util.cc +++ b/chrome/browser/debugger/devtools_file_util.cc @@ -4,9 +4,9 @@ #include "chrome/browser/debugger/devtools_file_util.h" +#include "base/bind.h" #include "base/file_util.h" #include "base/memory/ref_counted.h" - #include "chrome/browser/browser_process.h" #include "chrome/browser/download/download_prefs.h" #include "chrome/browser/profiles/profile.h" @@ -61,10 +61,7 @@ class SaveAsDialog : public SelectFileDialog::Listener, BrowserThread::PostTask( BrowserThread::FILE, FROM_HERE, - NewRunnableFunction( - &SaveAsDialog::WriteFile, - path, - content_)); + base::Bind(&SaveAsDialog::WriteFile, path, content_)); Release(); // Balanced in ::Show. } diff --git a/chrome/browser/debugger/devtools_protocol_handler.cc b/chrome/browser/debugger/devtools_protocol_handler.cc index 2245a96..bc6689e 100644 --- a/chrome/browser/debugger/devtools_protocol_handler.cc +++ b/chrome/browser/debugger/devtools_protocol_handler.cc @@ -4,6 +4,7 @@ #include "chrome/browser/debugger/devtools_protocol_handler.h" +#include "base/bind.h" #include "base/logging.h" #include "chrome/browser/debugger/inspectable_tab_proxy.h" #include "chrome/browser/debugger/debugger_remote_service.h" @@ -47,7 +48,7 @@ DevToolsProtocolHandler::~DevToolsProtocolHandler() { void DevToolsProtocolHandler::Start() { BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, - NewRunnableMethod(this, &DevToolsProtocolHandler::Init)); + base::Bind(&DevToolsProtocolHandler::Init, this)); } void DevToolsProtocolHandler::Init() { @@ -58,7 +59,7 @@ void DevToolsProtocolHandler::Init() { void DevToolsProtocolHandler::Stop() { BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, - NewRunnableMethod(this, &DevToolsProtocolHandler::Teardown)); + base::Bind(&DevToolsProtocolHandler::Teardown, this)); tool_to_listener_map_.clear(); // Releases all scoped_refptr's to listeners } @@ -95,8 +96,8 @@ void DevToolsProtocolHandler::HandleMessage( DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, - NewRunnableMethod( - it->second.get(), &DevToolsRemoteListener::HandleMessage, message)); + base::Bind(&DevToolsRemoteListener::HandleMessage, it->second.get(), + message)); } void DevToolsProtocolHandler::Send(const DevToolsRemoteMessage& message) { @@ -120,7 +121,6 @@ void DevToolsProtocolHandler::OnConnectionLost() { ++it) { BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, - NewRunnableMethod( - it->second.get(), &DevToolsRemoteListener::OnConnectionLost)); + base::Bind(&DevToolsRemoteListener::OnConnectionLost, it->second.get())); } } diff --git a/chrome/browser/debugger/devtools_remote_listen_socket_unittest.cc b/chrome/browser/debugger/devtools_remote_listen_socket_unittest.cc index 9821b59..26cbaa9 100644 --- a/chrome/browser/debugger/devtools_remote_listen_socket_unittest.cc +++ b/chrome/browser/debugger/devtools_remote_listen_socket_unittest.cc @@ -9,6 +9,7 @@ #include <netinet/in.h> #endif +#include "base/bind.h" #include "base/eintr_wrapper.h" #include "base/test/test_timeouts.h" #include "base/threading/platform_thread.h" @@ -98,8 +99,9 @@ void DevToolsRemoteListenSocketTester::SetUp() { thread_->StartWithOptions(options); loop_ = static_cast<MessageLoopForIO*>(thread_->message_loop()); - loop_->PostTask(FROM_HERE, NewRunnableMethod( - this, &DevToolsRemoteListenSocketTester::Listen)); + loop_->PostTask( + FROM_HERE, + base::Bind(&DevToolsRemoteListenSocketTester::Listen, this)); // verify Listen succeeded ASSERT_TRUE(NextAction(TestTimeouts::action_timeout_ms())); @@ -134,8 +136,9 @@ void DevToolsRemoteListenSocketTester::TearDown() { ASSERT_TRUE(NextAction(TestTimeouts::action_timeout_ms())); ASSERT_EQ(ACTION_CLOSE, last_action_.type()); - loop_->PostTask(FROM_HERE, NewRunnableMethod( - this, &DevToolsRemoteListenSocketTester::Shutdown)); + loop_->PostTask( + FROM_HERE, + base::Bind(&DevToolsRemoteListenSocketTester::Shutdown, this)); ASSERT_TRUE(NextAction(TestTimeouts::action_timeout_ms())); ASSERT_EQ(ACTION_SHUTDOWN, last_action_.type()); @@ -333,8 +336,9 @@ void DevToolsRemoteListenSocketTester::TestClientSend() { } void DevToolsRemoteListenSocketTester::TestServerSend() { - loop_->PostTask(FROM_HERE, NewRunnableMethod( - this, &DevToolsRemoteListenSocketTester::SendFromTester)); + loop_->PostTask( + FROM_HERE, + base::Bind(&DevToolsRemoteListenSocketTester::SendFromTester, this)); ASSERT_TRUE(NextAction(TestTimeouts::action_timeout_ms())); ASSERT_EQ(ACTION_SEND, last_action_.type()); // TODO(erikkay): Without this sleep, the recv seems to fail a small amount diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc index ff4f0aa..373cc43 100644 --- a/chrome/browser/debugger/devtools_sanity_unittest.cc +++ b/chrome/browser/debugger/devtools_sanity_unittest.cc @@ -2,6 +2,7 @@ // 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/command_line.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" @@ -362,8 +363,9 @@ class WorkerDevToolsSanityTest : public InProcessBrowserTest { } static void TerminateWorker(scoped_refptr<WorkerData> worker_data) { - BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, NewRunnableFunction( - &TerminateWorkerOnIOThread, worker_data)); + BrowserThread::PostTask( + BrowserThread::IO, FROM_HERE, + base::Bind(&TerminateWorkerOnIOThread, worker_data)); ui_test_utils::RunMessageLoop(); } @@ -391,8 +393,9 @@ class WorkerDevToolsSanityTest : public InProcessBrowserTest { static scoped_refptr<WorkerData> WaitForFirstSharedWorker() { scoped_refptr<WorkerData> worker_data(new WorkerData()); - BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, NewRunnableFunction( - &WaitForFirstSharedWorkerOnIOThread, worker_data)); + BrowserThread::PostTask( + BrowserThread::IO, FROM_HERE, + base::Bind(&WaitForFirstSharedWorkerOnIOThread, worker_data)); ui_test_utils::RunMessageLoop(); return worker_data; } |