Remove Thread wrapper class in forwarder2.

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 <hash_map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/id_map.h"
 #include "base/memory/linked_ptr.h"
+#include "base/memory/ref_counted.h"
 #include "tools/android/forwarder2/socket.h"
 
+namespace base {
+class SingleThreadTaskRunner;
+}  // namespace base
+
 namespace forwarder2 {
 
 class DeviceListener;
 

[digit1, 2013/07/18 20:08:39]

Can I ask you to add a comment describing the purpose of this class, as in:

// There is a single DeviceController per device_forwarder process,
// and it is in charge of managing all active redirections on the
// device side (one DeviceListener each).

[Philippe, 2013/07/22 15:16:14]

Sure, thanks :)

 class DeviceController {
  public:
   explicit DeviceController(int exit_notifier_fd);
   ~DeviceController();
 
   bool Init(const std::string& adb_unix_socket);

[Philippe, 2013/07/22 15:16:14]

FYI, I also removed this method in favor of a static factory method (doing
Init() + construction) as I had done before with DeviceListener. Classes should
be designed to be easy to use and hard to use incorrectly :)

 
   void Start();
 
  private:
-  void KillAllListeners();
-  void CleanUpDeadListeners();
+  void AcceptClientSoon();
+  void AcceptClientInternal();
+
+  void DeleteListener(int listener_port);
+  void DeleteListenerOnTaskRunner(int listener_port);
 
   // Map from Port to DeviceListener objects (owns the pointer).
   typedef IDMap<DeviceListener, IDMapOwnPointer> ListenersMap;

[Philippe, 2013/07/22 15:16:14]

FYI, I also switched from base::IDMap<> to std::hash_map<>.

 
+  // Lets delete DeviceListener instances on the thread they were created on
+  // (which is DeviceController's construction thread).
+  scoped_refptr<base::SingleThreadTaskRunner> listeners_deletion_thread_;
+
   ListenersMap listeners_;
   Socket kickstart_adb_socket_;
 
   // Used to notify the controller to exit.
   const int exit_notifier_fd_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceController);
 };
 
 }  // namespace forwarder
 
 #endif  // TOOLS_ANDROID_FORWARDER2_DEVICE_CONTROLLER_H_