Make HostController/DeviceListener deletion fully synchronous.

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"
@@ skipping 29 matching lines @@
 DeviceController::~DeviceController() {
   DCHECK(construction_task_runner_->RunsTasksOnCurrentThread());
 }
 
 void DeviceController::Start() {
   AcceptHostCommandSoon();
 }
 
 DeviceController::DeviceController(scoped_ptr<Socket> host_socket,
                                    int exit_notifier_fd)
-    : host_socket_(host_socket.Pass()),
+    : weak_ptr_factory_(this),
+      host_socket_(host_socket.Pass()),
       exit_notifier_fd_(exit_notifier_fd),
-      construction_task_runner_(base::MessageLoopProxy::current()),
-      weak_ptr_factory_(this) {
+      construction_task_runner_(base::MessageLoopProxy::current()) {
   host_socket_->AddEventFd(exit_notifier_fd);
 }
 
 void DeviceController::AcceptHostCommandSoon() {
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE,
       base::Bind(&DeviceController::AcceptHostCommandInternal,
                  base::Unretained(this)));
 }
 
@@ skipping 85 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