Clean up HID backend and API.

device/hid/hid_connection.h

Index: device/hid/hid_connection.h
diff --git a/device/hid/hid_connection.h b/device/hid/hid_connection.h
index 27792c482bc9e79ca251f82f8a041970e309e445..5c08fbc5bbdf5733e1e3a3c63149bed7044d768b 100644
--- a/device/hid/hid_connection.h
+++ b/device/hid/hid_connection.h
@@ -1,18 +1,16 @@
-// Copyright (c) 2014 The Chromium Authors. All rights reserved.
+// Copyright 2014 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 DEVICE_HID_HID_CONNECTION_H_
 #define DEVICE_HID_HID_CONNECTION_H_
 
+#include <stdint.h>
+
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
-#include "base/threading/thread_checker.h"
 #include "device/hid/hid_device_info.h"
-
-namespace net {
-class IOBuffer;
-}
+#include "net/base/io_buffer.h"
 
 namespace device {
 
@@ -20,35 +18,48 @@ class HidConnection : public base::RefCountedThreadSafe<HidConnection> {
  public:
   typedef base::Callback<void(bool success, size_t size)> IOCallback;
 
-  virtual void Read(scoped_refptr<net::IOBuffer> buffer,
-                    size_t size,
+  virtual void Read(scoped_refptr<net::IOBufferWithSize> buffer,
                     const IOCallback& callback) = 0;
-  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) = 0;
-  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) = 0;
-  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) = 0;
 
-  const HidDeviceInfo& device_info() const;
+  const HidDeviceInfo& device_info() const { return device_info_; }
 
  protected:
   friend class base::RefCountedThreadSafe<HidConnection>;
   friend struct HidDeviceInfo;
 
-  HidConnection(HidDeviceInfo device_info);
+  explicit HidConnection(const HidDeviceInfo& device_info);
   virtual ~HidConnection();
 
+ private:
   const HidDeviceInfo device_info_;
 
-  base::ThreadChecker thread_checker_;
-
   DISALLOW_COPY_AND_ASSIGN(HidConnection);
 };
 
+struct PendingHidReport {
+  PendingHidReport();
+  ~PendingHidReport();
+
+  scoped_refptr<net::IOBufferWithSize> buffer;
+};
+
+struct PendingHidRead {
+  PendingHidRead();
+  ~PendingHidRead();
+
+  scoped_refptr<net::IOBufferWithSize> buffer;
+  HidConnection::IOCallback callback;
+};
+
 }  // namespace device
 
 #endif  // DEVICE_HID_HID_CONNECTION_H_