Revert of Update device/usb and its Mojo interface for variable size ISO packets.

extensions/browser/api/usb/usb_apitest.cc

 // 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.
 
 #include <stddef.h>
 
-#include <numeric>
-
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_utils.h"
 #include "device/core/mock_device_client.h"
 #include "device/usb/mock_usb_device.h"
 #include "device/usb/mock_usb_device_handle.h"
 #include "device/usb/mock_usb_service.h"
 #include "extensions/browser/api/device_permissions_prompt.h"
 #include "extensions/browser/api/usb/usb_api.h"
 #include "extensions/shell/browser/shell_extensions_api_client.h"
@@ skipping 24 matching lines @@
 }
 
 ACTION_TEMPLATE(InvokeUsbTransferCallback,
                 HAS_1_TEMPLATE_PARAMS(int, k),
                 AND_1_VALUE_PARAMS(p1)) {
   net::IOBuffer* io_buffer = new net::IOBuffer(1);
   memset(io_buffer->data(), 0, 1);  // Avoid uninitialized reads.
   ::std::tr1::get<k>(args).Run(p1, io_buffer, 1);
 }
 
-ACTION_P2(InvokeUsbIsochronousTransferOutCallback,
-          transferred_length,
-          success_packets) {
-  std::vector<UsbDeviceHandle::IsochronousPacket> packets(arg2.size());
-  for (size_t i = 0; i < packets.size(); ++i) {
-    packets[i].length = arg2[i];
-    if (i < success_packets) {
-      packets[i].transferred_length = transferred_length;
-      packets[i].status = device::USB_TRANSFER_COMPLETED;
-    } else {
-      packets[i].transferred_length = 0;
-      packets[i].status = device::USB_TRANSFER_ERROR;
-    }
-  }
-  arg4.Run(arg1, packets);
-}
-
-ACTION_P2(InvokeUsbIsochronousTransferInCallback,
-          transferred_length,
-          success_packets) {
-  size_t total_length = std::accumulate(arg1.begin(), arg1.end(), 0u);
-  net::IOBuffer* io_buffer = new net::IOBuffer(total_length);
-  std::vector<UsbDeviceHandle::IsochronousPacket> packets(arg1.size());
-  for (size_t i = 0; i < packets.size(); ++i) {
-    packets[i].length = arg1[i];
-    packets[i].transferred_length = transferred_length;
-    if (i < success_packets) {
-      packets[i].transferred_length = transferred_length;
-      packets[i].status = device::USB_TRANSFER_COMPLETED;
-    } else {
-      packets[i].transferred_length = 0;
-      packets[i].status = device::USB_TRANSFER_ERROR;
-    }
-  }
-  arg3.Run(io_buffer, packets);
-}
-
 class TestDevicePermissionsPrompt
     : public DevicePermissionsPrompt,
       public DevicePermissionsPrompt::Prompt::Observer {
  public:
   explicit TestDevicePermissionsPrompt(content::WebContents* web_contents)
       : DevicePermissionsPrompt(web_contents) {}
 
   void ShowDialog() override { prompt()->SetObserver(this); }
 
   void OnDevicesChanged() override {
@@ skipping 97 matching lines @@
                               1,
                               _,
                               _))
       .WillOnce(InvokeUsbTransferCallback<9>(device::USB_TRANSFER_COMPLETED));
   EXPECT_CALL(*mock_device_handle_.get(),
               GenericTransfer(device::USB_DIRECTION_OUTBOUND, 1, _, 1, _, _))
       .WillOnce(InvokeUsbTransferCallback<5>(device::USB_TRANSFER_COMPLETED));
   EXPECT_CALL(*mock_device_handle_.get(),
               GenericTransfer(device::USB_DIRECTION_OUTBOUND, 2, _, 1, _, _))
       .WillOnce(InvokeUsbTransferCallback<5>(device::USB_TRANSFER_COMPLETED));
-  EXPECT_CALL(*mock_device_handle_.get(), IsochronousTransferOut(3, _, _, _, _))
-      .WillOnce(InvokeUsbIsochronousTransferOutCallback(1, 1u));
+  EXPECT_CALL(
+      *mock_device_handle_.get(),
+      IsochronousTransfer(device::USB_DIRECTION_OUTBOUND, 3, _, 1, 1, 1, _, _))
+      .WillOnce(InvokeUsbTransferCallback<7>(device::USB_TRANSFER_COMPLETED));
   EXPECT_CALL(*mock_device_handle_.get(), Close()).Times(AnyNumber());
   ASSERT_TRUE(RunAppTest("api_test/usb/transfer_event"));
 }
 
 IN_PROC_BROWSER_TEST_F(UsbApiTest, ZeroLengthTransfer) {
   EXPECT_CALL(*mock_device_handle_.get(), GenericTransfer(_, _, _, 0, _, _))
       .WillOnce(InvokeUsbTransferCallback<5>(device::USB_TRANSFER_COMPLETED));
   EXPECT_CALL(*mock_device_handle_.get(), Close()).Times(AnyNumber());
   ASSERT_TRUE(RunAppTest("api_test/usb/zero_length_transfer"));
 }
 
 IN_PROC_BROWSER_TEST_F(UsbApiTest, TransferFailure) {
-  EXPECT_CALL(*mock_device_handle_.get(),
-              GenericTransfer(device::USB_DIRECTION_OUTBOUND, 1, _, _, _, _))
+  EXPECT_CALL(*mock_device_handle_.get(), GenericTransfer(_, _, _, _, _, _))
       .WillOnce(InvokeUsbTransferCallback<5>(device::USB_TRANSFER_COMPLETED))
       .WillOnce(InvokeUsbTransferCallback<5>(device::USB_TRANSFER_ERROR))
       .WillOnce(InvokeUsbTransferCallback<5>(device::USB_TRANSFER_TIMEOUT));
-  EXPECT_CALL(*mock_device_handle_.get(), IsochronousTransferIn(2, _, _, _))
-      .WillOnce(InvokeUsbIsochronousTransferInCallback(8, 10u))
-      .WillOnce(InvokeUsbIsochronousTransferInCallback(8, 5u));
   EXPECT_CALL(*mock_device_handle_.get(), Close()).Times(AnyNumber());
   ASSERT_TRUE(RunAppTest("api_test/usb/transfer_failure"));
 }
 
 IN_PROC_BROWSER_TEST_F(UsbApiTest, InvalidLengthTransfer) {
   EXPECT_CALL(*mock_device_handle_.get(), Close()).Times(AnyNumber());
   ASSERT_TRUE(RunAppTest("api_test/usb/invalid_length_transfer"));
 }
 
 IN_PROC_BROWSER_TEST_F(UsbApiTest, InvalidTimeout) {
@@ skipping 39 matching lines @@
 
   TestExtensionsAPIClient test_api_client;
   ASSERT_TRUE(LoadApp("api_test/usb/get_user_selected_devices"));
   ASSERT_TRUE(ready_listener.WaitUntilSatisfied());
 
   device_client_->usb_service()->RemoveDevice(mock_device_);
   ASSERT_TRUE(result_listener.WaitUntilSatisfied());
 }
 
 }  // namespace extensions