Revert 281133 "chrome.hid: enrich model with report IDs"

Speculative revert to try and fix Win browser tests.

> chrome.hid: enrich model with report IDs
> 
> - add report IDs and max report size
> - don't expose sensitive usages
> 
> BUG=364423
> R=rockot@chromium.org
> TESTS=run device_unittests (HidReportDescriptorTest)
> 
> Review URL: https://codereview.chromium.org/317783010

TBR=jracle@logitech.com

Review URL: https://codereview.chromium.org/369923002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281282 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 21 insertions, 18 deletions

diff --git a/device/hid/hid_connection_mac.h b/device/hid/hid_connection_mac.h
index 02dde04..c307fb6 100644
--- a/device/hid/hid_connection_mac.h
+++ b/device/hid/hid_connection_mac.h
@@ -11,8 +11,11 @@
 #include <queue>
 
 #include "base/mac/foundation_util.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/threading/thread_checker.h"
 #include "device/hid/hid_connection.h"
+#include "device/hid/hid_device_info.h"
 
 namespace base {
 class MessageLoopProxy;
@@ -28,20 +31,17 @@ class HidConnectionMac : public HidConnection {
  public:
   explicit HidConnectionMac(HidDeviceInfo device_info);
 
-  // HidConnection implementation.
-  virtual void PlatformRead(scoped_refptr<net::IOBufferWithSize> buffer,
-                            const IOCallback& callback) OVERRIDE;
-  virtual void PlatformWrite(uint8_t report_id,
-                             scoped_refptr<net::IOBufferWithSize> buffer,
-                             const IOCallback& callback) OVERRIDE;
-  virtual void PlatformGetFeatureReport(
-      uint8_t report_id,
-      scoped_refptr<net::IOBufferWithSize> buffer,
-      const IOCallback& callback) OVERRIDE;
-  virtual void PlatformSendFeatureReport(
-      uint8_t report_id,
-      scoped_refptr<net::IOBufferWithSize> buffer,
-      const IOCallback& callback) OVERRIDE;
+  virtual void Read(scoped_refptr<net::IOBufferWithSize> buffer,
+                    const IOCallback& callback) OVERRIDE;
+  virtual void Write(uint8_t report_id,
+                     scoped_refptr<net::IOBufferWithSize> buffer,
+                     const IOCallback& callback) OVERRIDE;
+  virtual void GetFeatureReport(uint8_t report_id,
+                                scoped_refptr<net::IOBufferWithSize> buffer,
+                                const IOCallback& callback) OVERRIDE;
+  virtual void SendFeatureReport(uint8_t report_id,
+                                 scoped_refptr<net::IOBufferWithSize> buffer,
+                                 const IOCallback& callback) OVERRIDE;
 
  private:
   virtual ~HidConnectionMac();
@@ -53,26 +53,29 @@ class HidConnectionMac : public HidConnection {
                                   uint32_t report_id,
                                   uint8_t* report_bytes,
                                   CFIndex report_length);
+  void ProcessReadQueue();
+  void ProcessInputReport(IOHIDReportType type,
+                          scoped_refptr<net::IOBufferWithSize> buffer);
 
   void WriteReport(IOHIDReportType type,
                    uint8_t report_id,
                    scoped_refptr<net::IOBufferWithSize> buffer,
                    const IOCallback& callback);
 
-  void Flush();
-  void ProcessInputReport(scoped_refptr<net::IOBufferWithSize> buffer);
-  void ProcessReadQueue();
+  scoped_refptr<base::MessageLoopProxy> message_loop_;
 
   base::ScopedCFTypeRef<IOHIDDeviceRef> device_;
-  scoped_refptr<base::MessageLoopProxy> message_loop_;
   scoped_ptr<uint8_t, base::FreeDeleter> inbound_buffer_;
 
   std::queue<PendingHidReport> pending_reports_;
   std::queue<PendingHidRead> pending_reads_;
 
+  base::ThreadChecker thread_checker_;
+
   DISALLOW_COPY_AND_ASSIGN(HidConnectionMac);
 };
 
+
 }  // namespace device
 
 #endif  // DEVICE_HID_HID_CONNECTION_MAC_H_