Make HostController/DeviceListener deletion fully synchronous.

tools/android/forwarder2/device_controller.h

 // 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.
 
 #ifndef TOOLS_ANDROID_FORWARDER2_DEVICE_CONTROLLER_H_
 #define TOOLS_ANDROID_FORWARDER2_DEVICE_CONTROLLER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 31 matching lines @@
 
   void AcceptHostCommandSoon();
   void AcceptHostCommandInternal();
 
   // Note that this can end up being called after the DeviceController is
   // destroyed which is why a weak pointer is used.
   static void DeleteListenerOnError(
       const base::WeakPtr<DeviceController>& device_controller_ptr,
       scoped_ptr<DeviceListener> device_listener);
 
+  base::WeakPtrFactory<DeviceController> weak_ptr_factory_;
   const scoped_ptr<Socket> host_socket_;
   // Used to notify the controller to exit.
   const int exit_notifier_fd_;
   // Lets ensure DeviceListener instances are deleted on the thread they were
   // created on.
   const scoped_refptr<base::SingleThreadTaskRunner> construction_task_runner_;
-  base::WeakPtrFactory<DeviceController> weak_ptr_factory_;
   ListenersMap listeners_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceController);
 };
 
 }  // namespace forwarder
 
 #endif  // TOOLS_ANDROID_FORWARDER2_DEVICE_CONTROLLER_H_