| Index: tools/android/forwarder2/host_forwarder_main.cc
|
| diff --git a/tools/android/forwarder2/host_forwarder_main.cc b/tools/android/forwarder2/host_forwarder_main.cc
|
| index 16a7b512990845dd66917a24abf49120cab47aaa..3e08321930da56a44a2b9f1c85781c2738da61fb 100644
|
| --- a/tools/android/forwarder2/host_forwarder_main.cc
|
| +++ b/tools/android/forwarder2/host_forwarder_main.cc
|
| @@ -93,8 +93,7 @@ class HostControllersManager {
|
| if (!thread_.get())
|
| return;
|
| // Delete the controllers on the thread they were created on.
|
| - thread_->message_loop_proxy()->DeleteSoon(
|
| - FROM_HERE, controllers_.release());
|
| + thread_->task_runner()->DeleteSoon(FROM_HERE, controllers_.release());
|
| }
|
|
|
| void HandleRequest(const std::string& adb_path,
|
| @@ -104,7 +103,7 @@ class HostControllersManager {
|
| scoped_ptr<Socket> client_socket) {
|
| // Lazy initialize so that the CLI process doesn't get this thread created.
|
| InitOnce();
|
| - thread_->message_loop_proxy()->PostTask(
|
| + thread_->task_runner()->PostTask(
|
| FROM_HERE,
|
| base::Bind(&HostControllersManager::HandleRequestOnInternalThread,
|
| base::Unretained(this), adb_path, device_serial, device_port,
|
| @@ -143,7 +142,7 @@ class HostControllersManager {
|
| // then all the controllers (including |controller|) were also deleted.
|
| return;
|
| }
|
| - DCHECK(manager->thread_->message_loop_proxy()->RunsTasksOnCurrentThread());
|
| + DCHECK(manager->thread_->task_runner()->RunsTasksOnCurrentThread());
|
| // Note that this will delete |controller| which is owned by the map.
|
| DeleteRefCountedValueInMap(
|
| MakeHostControllerMapKey(
|
|
|