Clean up HID backend and API.

device/hid/hid_connection_win.h

Index: device/hid/hid_connection_win.h
diff --git a/device/hid/hid_connection_win.h b/device/hid/hid_connection_win.h
index 6cbb9e992e780aca5716e388a3817b69fc3de72d..fab93947410969ad93b9d74a60ba0378d2b17856 100644
--- a/device/hid/hid_connection_win.h
+++ b/device/hid/hid_connection_win.h
@@ -5,9 +5,10 @@
 #ifndef DEVICE_HID_HID_CONNECTION_WIN_H_
 #define DEVICE_HID_HID_CONNECTION_WIN_H_
 
-#include <set>
 #include <windows.h>
 
+#include <set>
+
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
@@ -15,7 +16,6 @@
 #include "base/win/object_watcher.h"
 #include "device/hid/hid_connection.h"
 #include "device/hid/hid_device_info.h"
-#include "net/base/io_buffer.h"
 
 namespace device {
 
@@ -26,8 +26,8 @@ class HidConnectionWin : public HidConnection {
                            public base::MessageLoop::DestructionObserver {
    public:
     PendingTransfer(scoped_refptr<HidConnectionWin> conn,
-                    scoped_refptr<net::IOBuffer> target,
-                    scoped_refptr<net::IOBuffer> receiving,
+                    scoped_refptr<net::IOBufferWithSize> target,
+                    scoped_refptr<net::IOBufferWithSize> receiving,
                     bool is_input,
                     IOCallback callback);
 
@@ -50,8 +50,8 @@ class HidConnectionWin : public HidConnection {
 
     scoped_refptr<HidConnectionWin> conn_;
     bool is_input_;
-    scoped_refptr<net::IOBuffer> target_;
-    scoped_refptr<net::IOBuffer> receiving_;
+    scoped_refptr<net::IOBufferWithSize> target_;
+    scoped_refptr<net::IOBufferWithSize> receiving_;
     IOCallback callback_;
     OVERLAPPED overlapped_;
     base::win::ScopedHandle event_;
@@ -60,26 +60,22 @@ class HidConnectionWin : public HidConnection {
     DISALLOW_COPY_AND_ASSIGN(PendingTransfer);
   };
 
-  HidConnectionWin(HidDeviceInfo device_info);
+  HidConnectionWin(HidDeviceInfo device_info, const std::string& device_path);
 
-  virtual void Read(scoped_refptr<net::IOBuffer> buffer,
-                    size_t size,
+  bool available() const;
+
+  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(scoped_refptr<net::IOBufferWithSize> buffer,
                      const IOCallback& callback) OVERRIDE;
-  virtual void GetFeatureReport(scoped_refptr<net::IOBuffer> buffer,
-                                size_t size,
+  virtual void GetFeatureReport(scoped_refptr<net::IOBufferWithSize> buffer,
                                 const IOCallback& callback) OVERRIDE;
-  virtual void SendFeatureReport(scoped_refptr<net::IOBuffer> buffer,
-                                 size_t size,
+  virtual void SendFeatureReport(scoped_refptr<net::IOBufferWithSize> buffer,
                                  const IOCallback& callback) OVERRIDE;
 
   void OnTransferFinished(scoped_refptr<PendingTransfer> transfer);
   void OnTransferCanceled(scoped_refptr<PendingTransfer> transfer);
 
-  bool available() const { return available_; }
-
  private:
   ~HidConnectionWin();
 
@@ -87,8 +83,6 @@ class HidConnectionWin : public HidConnection {
   std::set<scoped_refptr<PendingTransfer> > transfers_;
 
   DISALLOW_COPY_AND_ASSIGN(HidConnectionWin);
-
-  bool available_;
 };
 
 }  // namespace device