Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2

tools/android/forwarder2/device_listener.cc

 // Copyright (c) 2012 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 "tools/android/forwarder2/device_listener.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/message_loop/message_loop_proxy.h"
 #include "base/single_thread_task_runner.h"
 #include "tools/android/forwarder2/command.h"
 #include "tools/android/forwarder2/forwarder.h"
 #include "tools/android/forwarder2/socket.h"
 
 namespace forwarder2 {
 
 // static
 scoped_ptr<DeviceListener> DeviceListener::Create(
     scoped_ptr<Socket> host_socket,
@@ skipping 21 matching lines @@
   DCHECK(deletion_task_runner_->RunsTasksOnCurrentThread());
   deletion_notifier_.Notify();
 }
 
 void DeviceListener::Start() {
   thread_.Start();
   AcceptNextClientSoon();
 }
 
 void DeviceListener::SetAdbDataSocket(scoped_ptr<Socket> adb_data_socket) {
-  thread_.message_loop_proxy()->PostTask(
+  thread_.task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&DeviceListener::OnAdbDataSocketReceivedOnInternalThread,
                  base::Unretained(this), base::Passed(&adb_data_socket)));
 }
 
 DeviceListener::DeviceListener(scoped_ptr<Socket> listener_socket,
                                scoped_ptr<Socket> host_socket,
                                int port,
                                const ErrorCallback& error_callback)
     : self_deleter_helper_(this, error_callback),
       listener_socket_(listener_socket.Pass()),
       host_socket_(host_socket.Pass()),
       listener_port_(port),
-      deletion_task_runner_(base::MessageLoopProxy::current()),
+      deletion_task_runner_(base::MessageLoop::current()->task_runner()),
       thread_("DeviceListener") {
   CHECK(host_socket_.get());
   DCHECK(deletion_task_runner_.get());
   host_socket_->AddEventFd(deletion_notifier_.receiver_fd());
   listener_socket_->AddEventFd(deletion_notifier_.receiver_fd());
 }
 
 void DeviceListener::AcceptNextClientSoon() {
-  thread_.message_loop_proxy()->PostTask(
-      FROM_HERE,
-      base::Bind(&DeviceListener::AcceptClientOnInternalThread,
-                 base::Unretained(this)));
+  thread_.task_runner()->PostTask(
+      FROM_HERE, base::Bind(&DeviceListener::AcceptClientOnInternalThread,
+                            base::Unretained(this)));
 }
 
 void DeviceListener::AcceptClientOnInternalThread() {
   device_data_socket_.reset(new Socket());
   if (!listener_socket_->Accept(device_data_socket_.get())) {
     if (listener_socket_->DidReceiveEvent()) {
       LOG(INFO) << "Received exit notification, stopped accepting clients.";
       OnInternalThreadError();
       return;
     }
@@ skipping 30 matching lines @@
   forwarders_manager_.CreateAndStartNewForwarder(
       device_data_socket_.Pass(), adb_data_socket.Pass());
   AcceptNextClientSoon();
 }
 
 void DeviceListener::OnInternalThreadError() {
   self_deleter_helper_.MaybeSelfDeleteSoon();
 }
 
 }  // namespace forwarder