Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2

tools/android/forwarder2/device_controller.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_controller.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback_helpers.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/device_listener.h"
 #include "tools/android/forwarder2/socket.h"
 #include "tools/android/forwarder2/util.h"
 
 namespace forwarder2 {
 
 // static
 scoped_ptr<DeviceController> DeviceController::Create(
@@ skipping 17 matching lines @@
 }
 
 void DeviceController::Start() {
   AcceptHostCommandSoon();
 }
 
 DeviceController::DeviceController(scoped_ptr<Socket> host_socket,
                                    int exit_notifier_fd)
     : host_socket_(host_socket.Pass()),
       exit_notifier_fd_(exit_notifier_fd),
-      construction_task_runner_(base::MessageLoopProxy::current()),
+      construction_task_runner_(base::MessageLoop::current()->task_runner()),
       weak_ptr_factory_(this) {
   host_socket_->AddEventFd(exit_notifier_fd);
 }
 
 void DeviceController::AcceptHostCommandSoon() {
-  base::MessageLoopProxy::current()->PostTask(
-      FROM_HERE,
-      base::Bind(&DeviceController::AcceptHostCommandInternal,
-                 base::Unretained(this)));
+  base::MessageLoop::current()->PostTask(
+      FROM_HERE, base::Bind(&DeviceController::AcceptHostCommandInternal,
+                            base::Unretained(this)));
 }
 
 void DeviceController::AcceptHostCommandInternal() {
   scoped_ptr<Socket> socket(new Socket);
   if (!host_socket_->Accept(socket.get())) {
     if (!host_socket_->DidReceiveEvent())
       PLOG(ERROR) << "Could not Accept DeviceController socket";
     else
       LOG(INFO) << "Received exit notification";
     return;
@@ skipping 77 matching lines @@
     return;
   }
   DCHECK(controller->construction_task_runner_->RunsTasksOnCurrentThread());
   bool listener_did_exist = DeleteRefCountedValueInMap(
       listener->listener_port(), &controller->listeners_);
   DCHECK(listener_did_exist);
   // Note that |listener| was deleted by DeleteRefCountedValueInMap().
 }
 
 }  // namespace forwarder