Clean up HID backend and API.

device/hid/hid_connection_linux.h

Index: device/hid/hid_connection_linux.h
diff --git a/device/hid/hid_connection_linux.h b/device/hid/hid_connection_linux.h
index 78c89525cb8abb2e06ca9ab383d772c935cfc177..67d6299ad42a49933c97c8ebd327d17d0e806ca4 100644
--- a/device/hid/hid_connection_linux.h
+++ b/device/hid/hid_connection_linux.h
@@ -7,11 +7,9 @@
 
 #include "base/files/file.h"
 #include "base/memory/ref_counted.h"
-#include "base/tuple.h"
 #include "device/hid/hid_connection.h"
 #include "device/hid/hid_device_info.h"
 #include "device/hid/hid_service_linux.h"
-#include "net/base/io_buffer.h"
 
 namespace device {
 
@@ -21,21 +19,18 @@ class HidConnectionLinux : public HidConnection,
   HidConnectionLinux(HidDeviceInfo device_info,
                      ScopedUdevDevicePtr udev_raw_device);
 
-  virtual void Read(scoped_refptr<net::IOBuffer> buffer,
-                    size_t size,
+  virtual void Read(scoped_refptr<net::IOBufferWithSize> buffer,
                     const IOCallback& callback) OVERRIDE;
-  virtual void Write(scoped_refptr<net::IOBuffer> buffer,
-                     size_t size,
+  virtual void Write(uint8_t report_id,
+                     scoped_refptr<net::IOBufferWithSize> buffer,
                      const IOCallback& callback) OVERRIDE;
-  virtual void GetFeatureReport(scoped_refptr<net::IOBuffer> buffer,
-                                size_t size,
+  virtual void GetFeatureReport(uint8_t report_id,
+                                scoped_refptr<net::IOBufferWithSize> buffer,
                                 const IOCallback& callback) OVERRIDE;
-  virtual void SendFeatureReport(scoped_refptr<net::IOBuffer> buffer,
-                                 size_t size,
+  virtual void SendFeatureReport(uint8_t report_id,
+                                 scoped_refptr<net::IOBufferWithSize> buffer,
                                  const IOCallback& callback) OVERRIDE;
 
-  bool initialized() const { return initialized_; }
-
   // Implements base::MessagePumpLibevent::Watcher
   virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE;
   virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE;
@@ -52,14 +47,10 @@ class HidConnectionLinux : public HidConnection,
   base::File device_file_;
   base::MessagePumpLibevent::FileDescriptorWatcher device_file_watcher_;
 
-  typedef std::pair<scoped_refptr<net::IOBuffer>, size_t> PendingReport;
-  typedef Tuple3<scoped_refptr<net::IOBuffer>, size_t, IOCallback>
-      PendingRequest;
-
-  std::queue<PendingReport> input_reports_;
-  std::queue<PendingRequest> read_queue_;
+  std::queue<PendingHidReport> pending_reports_;
+  std::queue<PendingHidRead> pending_reads_;
 
-  bool initialized_;
+  base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(HidConnectionLinux);
 };