Add chrome.usb.listInterfaces API

chrome/browser/extensions/api/usb/usb_apitest.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/extensions/api/usb/usb_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/usb/usb_service.h"
 #include "chrome/browser/usb/usb_service_factory.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 27 matching lines @@
 #if defined(OS_WIN)
 #pragma warning(push)
 #pragma warning(disable:4373)
 #endif
 class MockUsbDevice : public UsbDevice {
  public:
   MockUsbDevice() : UsbDevice() {}
 
   MOCK_METHOD1(Close, void(const base::Callback<void()>& callback));
 
-  MOCK_METHOD10(ControlTransfer, void(const TransferDirection direction,
+  MOCK_METHOD10(ControlTransfer, void(const UsbEndpointDirection direction,
       const TransferRequestType request_type, const TransferRecipient recipient,
       const uint8 request, const uint16 value, const uint16 index,
       net::IOBuffer* buffer, const size_t length, const unsigned int timeout,
       const UsbTransferCallback& callback));
 
-  MOCK_METHOD6(BulkTransfer, void(const TransferDirection direction,
+  MOCK_METHOD6(BulkTransfer, void(const UsbEndpointDirection direction,
       const uint8 endpoint, net::IOBuffer* buffer, const size_t length,
       const unsigned int timeout, const UsbTransferCallback& callback));
 
-  MOCK_METHOD6(InterruptTransfer, void(const TransferDirection direction,
+  MOCK_METHOD6(InterruptTransfer, void(const UsbEndpointDirection direction,
       const uint8 endpoint, net::IOBuffer* buffer, const size_t length,
       const unsigned int timeout, const UsbTransferCallback& callback));
 
-  MOCK_METHOD8(IsochronousTransfer, void(const TransferDirection direction,
+  MOCK_METHOD8(IsochronousTransfer, void(const UsbEndpointDirection direction,
       const uint8 endpoint, net::IOBuffer* buffer, const size_t length,
       const unsigned int packets, const unsigned int packet_length,
       const unsigned int timeout, const UsbTransferCallback& callback));
 
   MOCK_METHOD1(ResetDevice, void(const base::Callback<void(bool)>& callback));
 
+  MOCK_METHOD2(ListInterfaces, void(UsbConfigDescriptor* config,
+      const UsbInterfaceCallback& callback));
+
  protected:
   virtual ~MockUsbDevice() {}
 };
 #if defined(OS_WIN)
 #pragma warning(pop)
 #endif
 
 class UsbApiTest : public ExtensionApiTest {
  public:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
@@ skipping 12 matching lines @@
 
 }  // namespace
 
 IN_PROC_BROWSER_TEST_F(UsbApiTest, DeviceHandling) {
   EXPECT_CALL(*mock_device_, Close(_))
       .WillRepeatedly(InvokeUsbCallback());
   EXPECT_CALL(*mock_device_, ResetDevice(_))
     .WillOnce(InvokeUsbResultCallback<0>(true))
     .WillOnce(InvokeUsbResultCallback<0>(false));
   EXPECT_CALL(*mock_device_,
-              InterruptTransfer(UsbDevice::OUTBOUND, 2, _, 1, _, _))
+              InterruptTransfer(USB_DIRECTION_OUTBOUND, 2, _, 1, _, _))
     .WillOnce(InvokeUsbTransferCallback<5>(USB_TRANSFER_COMPLETED));
   ASSERT_TRUE(RunExtensionTest("usb/device_handling"));
 }
 
+IN_PROC_BROWSER_TEST_F(UsbApiTest, ListInterfaces) {
+  EXPECT_CALL(*mock_device_, ListInterfaces(_, _))
+    .WillOnce(InvokeUsbResultCallback<1>(false));
+  EXPECT_CALL(*mock_device_, Close(_)).Times(AnyNumber());
+  ASSERT_TRUE(RunExtensionTest("usb/list_interfaces"));
+}
+
 IN_PROC_BROWSER_TEST_F(UsbApiTest, TransferEvent) {
   EXPECT_CALL(*mock_device_,
-      ControlTransfer(UsbDevice::OUTBOUND, UsbDevice::STANDARD,
+      ControlTransfer(USB_DIRECTION_OUTBOUND, UsbDevice::STANDARD,
           UsbDevice::DEVICE, 1, 2, 3, _, 1, _, _))
       .WillOnce(InvokeUsbTransferCallback<9>(USB_TRANSFER_COMPLETED));
   EXPECT_CALL(*mock_device_,
-      BulkTransfer(UsbDevice::OUTBOUND, 1, _, 1, _, _))
+      BulkTransfer(USB_DIRECTION_OUTBOUND, 1, _, 1, _, _))
       .WillOnce(InvokeUsbTransferCallback<5>(USB_TRANSFER_COMPLETED));
   EXPECT_CALL(*mock_device_,
-      InterruptTransfer(UsbDevice::OUTBOUND, 2, _, 1, _, _))
+      InterruptTransfer(USB_DIRECTION_OUTBOUND, 2, _, 1, _, _))
       .WillOnce(InvokeUsbTransferCallback<5>(USB_TRANSFER_COMPLETED));
   EXPECT_CALL(*mock_device_,
-      IsochronousTransfer(UsbDevice::OUTBOUND, 3, _, 1, 1, 1, _, _))
+      IsochronousTransfer(USB_DIRECTION_OUTBOUND, 3, _, 1, 1, 1, _, _))
       .WillOnce(InvokeUsbTransferCallback<7>(USB_TRANSFER_COMPLETED));
   EXPECT_CALL(*mock_device_, Close(_)).Times(AnyNumber());
   ASSERT_TRUE(RunExtensionTest("usb/transfer_event"));
 }
 
 IN_PROC_BROWSER_TEST_F(UsbApiTest, ZeroLengthTransfer) {
   EXPECT_CALL(*mock_device_, BulkTransfer(_, _, _, 0, _, _))
       .WillOnce(InvokeUsbTransferCallback<5>(USB_TRANSFER_COMPLETED));
   EXPECT_CALL(*mock_device_, Close(_)).Times(AnyNumber());
   ASSERT_TRUE(RunExtensionTest("usb/zero_length_transfer"));
 }
 
 IN_PROC_BROWSER_TEST_F(UsbApiTest, TransferFailure) {
   EXPECT_CALL(*mock_device_, BulkTransfer(_, _, _, _, _, _))
       .WillOnce(InvokeUsbTransferCallback<5>(USB_TRANSFER_COMPLETED))
       .WillOnce(InvokeUsbTransferCallback<5>(USB_TRANSFER_ERROR))
       .WillOnce(InvokeUsbTransferCallback<5>(USB_TRANSFER_TIMEOUT));
   EXPECT_CALL(*mock_device_, Close(_)).Times(AnyNumber());
   ASSERT_TRUE(RunExtensionTest("usb/transfer_failure"));
 }
 
 IN_PROC_BROWSER_TEST_F(UsbApiTest, InvalidLengthTransfer) {
   EXPECT_CALL(*mock_device_, Close(_)).Times(AnyNumber());
   ASSERT_TRUE(RunExtensionTest("usb/invalid_length_transfer"));
 }