Enumerate HID devices asynchronously on Windows.

device/hid/hid_service_win.h

Index: device/hid/hid_service_win.h
diff --git a/device/hid/hid_service_win.h b/device/hid/hid_service_win.h
index 902d431fe2cb345ccdd4b0e271f0718c42faa305..55866ee327c78a1748440b7d87df866354b13254 100644
--- a/device/hid/hid_service_win.h
+++ b/device/hid/hid_service_win.h
@@ -14,6 +14,7 @@ extern "C" {
 }
 
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "base/scoped_observer.h"
 #include "base/win/scoped_handle.h"
 #include "device/core/device_monitor_win.h"
@@ -30,7 +31,7 @@ namespace device {
 
 class HidServiceWin : public HidService, public DeviceMonitorWin::Observer {
  public:
-  HidServiceWin();
+  HidServiceWin(scoped_refptr<base::SingleThreadTaskRunner> file_task_runner);
 
   virtual void Connect(const HidDeviceId& device_id,
                        const ConnectCallback& callback) override;
@@ -38,7 +39,9 @@ class HidServiceWin : public HidService, public DeviceMonitorWin::Observer {
  private:
   virtual ~HidServiceWin();
 
-  void DoInitialEnumeration();
+  static void InitialEnumerationFileThread(

[Ken Rockot(use gerrit already), 2015/02/18 20:40:23]

nit: Judging from its ubiquity across the codebase I would suggest that an
idiomatic suffix would be "OnFileThread" for this method (and AddDevice...
below).

On a related note, I'd hesitate to use any non-accessor method name that isn't a
verb phrase. Would this be OK as EnumerateOnFileThread? Or maybe
DoFirstEnumerationOnFileThread if you think the "initial" qualification is
important?

+      base::WeakPtr<HidServiceWin> service,
+      scoped_refptr<base::SingleThreadTaskRunner> task_runner);
   static void CollectInfoFromButtonCaps(PHIDP_PREPARSED_DATA preparsed_data,
                                         HIDP_REPORT_TYPE report_type,
                                         USHORT button_caps_length,
@@ -47,16 +50,22 @@ class HidServiceWin : public HidService, public DeviceMonitorWin::Observer {
                                        HIDP_REPORT_TYPE report_type,
                                        USHORT value_caps_length,
                                        HidCollectionInfo* collection_info);
+  static void AddDeviceFileThread(
+      base::WeakPtr<HidServiceWin> service,
+      scoped_refptr<base::SingleThreadTaskRunner> task_runner,
+      const std::string& device_path);
 
   // DeviceMonitorWin::Observer implementation:
   void OnDeviceAdded(const std::string& device_path) override;
   void OnDeviceRemoved(const std::string& device_path) override;
 
   // Tries to open the device read-write and falls back to read-only.
-  base::win::ScopedHandle OpenDevice(const std::string& device_path);
+  static base::win::ScopedHandle OpenDevice(const std::string& device_path);
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
+  scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_;
   ScopedObserver<DeviceMonitorWin, DeviceMonitorWin::Observer> device_observer_;
+  base::WeakPtrFactory<HidServiceWin> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(HidServiceWin);
 };