Use Mojo enum types in the C++ USB interface

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 "base/memory/ptr_util.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 10 matching lines @@
 #include "net/base/io_buffer.h"
 
 using testing::_;
 using testing::AnyNumber;
 using testing::Invoke;
 using testing::Return;
 using device::MockDeviceClient;
 using device::MockUsbDevice;
 using device::MockUsbDeviceHandle;
 using device::UsbConfigDescriptor;
+using device::UsbControlTransferRecipient;
+using device::UsbControlTransferType;
 using device::UsbDeviceHandle;
-using device::UsbEndpointDirection;
 using device::UsbInterfaceDescriptor;
+using device::UsbTransferDirection;
+using device::UsbTransferStatus;
 
 namespace extensions {
 
 namespace {
 
 ACTION_TEMPLATE(InvokeCallback,
                 HAS_1_TEMPLATE_PARAMS(int, k),
                 AND_1_VALUE_PARAMS(p1)) {
   ::std::tr1::get<k>(args).Run(p1);
 }
 
 ACTION_TEMPLATE(InvokeUsbTransferCallback,
                 HAS_1_TEMPLATE_PARAMS(int, k),
                 AND_1_VALUE_PARAMS(p1)) {
   net::IOBuffer* io_buffer = nullptr;
   size_t length = 0;
-  if (p1 != device::USB_TRANSFER_ERROR) {
+  if (p1 != UsbTransferStatus::TRANSFER_ERROR) {
     length = 1;
     io_buffer = new net::IOBuffer(length);
     memset(io_buffer->data(), 0, length);  // 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;
+      packets[i].status = UsbTransferStatus::COMPLETED;
     } else {
       packets[i].transferred_length = 0;
-      packets[i].status = device::USB_TRANSFER_ERROR;
+      packets[i].status = UsbTransferStatus::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);
   memset(io_buffer->data(), 0, total_length);  // Avoid uninitialized reads.
   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;
+      packets[i].status = UsbTransferStatus::COMPLETED;
     } else {
       packets[i].transferred_length = 0;
-      packets[i].status = device::USB_TRANSFER_ERROR;
+      packets[i].status = UsbTransferStatus::TRANSFER_ERROR;
     }
   }
   arg3.Run(io_buffer, packets);
 }
 
 ACTION_P(SetConfiguration, mock_device) {
   mock_device->ActiveConfigurationChanged(arg0);
   arg1.Run(true);
 }
 
@@ skipping 70 matching lines @@
   EXPECT_CALL(*mock_device_handle_, Close()).Times(2);
   ASSERT_TRUE(RunAppTest("api_test/usb/device_handling"));
 }
 
 IN_PROC_BROWSER_TEST_F(UsbApiTest, ResetDevice) {
   EXPECT_CALL(*mock_device_handle_, Close()).Times(2);
   EXPECT_CALL(*mock_device_handle_, ResetDevice(_))
       .WillOnce(InvokeCallback<0>(true))
       .WillOnce(InvokeCallback<0>(false));
   EXPECT_CALL(*mock_device_handle_,
-              GenericTransfer(device::USB_DIRECTION_OUTBOUND, 2, _, 1, _, _))
-      .WillOnce(InvokeUsbTransferCallback<5>(device::USB_TRANSFER_COMPLETED));
+              GenericTransfer(UsbTransferDirection::OUTBOUND, 2, _, 1, _, _))
+      .WillOnce(InvokeUsbTransferCallback<5>(UsbTransferStatus::COMPLETED));
   ASSERT_TRUE(RunAppTest("api_test/usb/reset_device"));
 }
 
 IN_PROC_BROWSER_TEST_F(UsbApiTest, SetConfiguration) {
   EXPECT_CALL(*mock_device_handle_, SetConfiguration(1, _))
       .WillOnce(SetConfiguration(mock_device_.get()));
   EXPECT_CALL(*mock_device_handle_, Close()).Times(1);
   ASSERT_TRUE(RunAppTest("api_test/usb/set_configuration"));
 }
 
 IN_PROC_BROWSER_TEST_F(UsbApiTest, ListInterfaces) {
   mock_device_->ActiveConfigurationChanged(1);
   EXPECT_CALL(*mock_device_handle_, Close()).Times(1);
   ASSERT_TRUE(RunAppTest("api_test/usb/list_interfaces"));
 }
 
 IN_PROC_BROWSER_TEST_F(UsbApiTest, TransferEvent) {
   EXPECT_CALL(
       *mock_device_handle_,
-      ControlTransfer(device::USB_DIRECTION_OUTBOUND, UsbDeviceHandle::STANDARD,
-                      UsbDeviceHandle::DEVICE, 1, 2, 3, _, 1, _, _))
-      .WillOnce(InvokeUsbTransferCallback<9>(device::USB_TRANSFER_COMPLETED));
+      ControlTransfer(UsbTransferDirection::OUTBOUND,
+                      UsbControlTransferType::STANDARD,
+                      UsbControlTransferRecipient::DEVICE, 1, 2, 3, _, 1, _, _))
+      .WillOnce(InvokeUsbTransferCallback<9>(UsbTransferStatus::COMPLETED));
   EXPECT_CALL(*mock_device_handle_,
-              GenericTransfer(device::USB_DIRECTION_OUTBOUND, 1, _, 1, _, _))
-      .WillOnce(InvokeUsbTransferCallback<5>(device::USB_TRANSFER_COMPLETED));
+              GenericTransfer(UsbTransferDirection::OUTBOUND, 1, _, 1, _, _))
+      .WillOnce(InvokeUsbTransferCallback<5>(UsbTransferStatus::COMPLETED));
   EXPECT_CALL(*mock_device_handle_,
-              GenericTransfer(device::USB_DIRECTION_OUTBOUND, 2, _, 1, _, _))
-      .WillOnce(InvokeUsbTransferCallback<5>(device::USB_TRANSFER_COMPLETED));
+              GenericTransfer(UsbTransferDirection::OUTBOUND, 2, _, 1, _, _))
+      .WillOnce(InvokeUsbTransferCallback<5>(UsbTransferStatus::COMPLETED));
   EXPECT_CALL(*mock_device_handle_, IsochronousTransferOut(3, _, _, _, _))
       .WillOnce(InvokeUsbIsochronousTransferOutCallback(1, 1u));
   EXPECT_CALL(*mock_device_handle_, Close()).Times(AnyNumber());
   ASSERT_TRUE(RunAppTest("api_test/usb/transfer_event"));
 }
 
 IN_PROC_BROWSER_TEST_F(UsbApiTest, ZeroLengthTransfer) {
   EXPECT_CALL(*mock_device_handle_, GenericTransfer(_, _, _, 0, _, _))
-      .WillOnce(InvokeUsbTransferCallback<5>(device::USB_TRANSFER_COMPLETED));
+      .WillOnce(InvokeUsbTransferCallback<5>(UsbTransferStatus::COMPLETED));
   EXPECT_CALL(*mock_device_handle_, Close()).Times(AnyNumber());
   ASSERT_TRUE(RunAppTest("api_test/usb/zero_length_transfer"));
 }
 
 IN_PROC_BROWSER_TEST_F(UsbApiTest, TransferFailure) {
   EXPECT_CALL(*mock_device_handle_,
-              GenericTransfer(device::USB_DIRECTION_OUTBOUND, 1, _, _, _, _))
-      .WillOnce(InvokeUsbTransferCallback<5>(device::USB_TRANSFER_COMPLETED))
-      .WillOnce(InvokeUsbTransferCallback<5>(device::USB_TRANSFER_ERROR))
-      .WillOnce(InvokeUsbTransferCallback<5>(device::USB_TRANSFER_TIMEOUT));
+              GenericTransfer(UsbTransferDirection::OUTBOUND, 1, _, _, _, _))
+      .WillOnce(InvokeUsbTransferCallback<5>(UsbTransferStatus::COMPLETED))
+      .WillOnce(InvokeUsbTransferCallback<5>(UsbTransferStatus::TRANSFER_ERROR))
+      .WillOnce(InvokeUsbTransferCallback<5>(UsbTransferStatus::TIMEOUT));
   EXPECT_CALL(*mock_device_handle_, IsochronousTransferIn(2, _, _, _))
       .WillOnce(InvokeUsbIsochronousTransferInCallback(8, 10u))
       .WillOnce(InvokeUsbIsochronousTransferInCallback(8, 5u));
   EXPECT_CALL(*mock_device_handle_, Close()).Times(AnyNumber());
   ASSERT_TRUE(RunAppTest("api_test/usb/transfer_failure"));
 }
 
 IN_PROC_BROWSER_TEST_F(UsbApiTest, InvalidLengthTransfer) {
   EXPECT_CALL(*mock_device_handle_, Close()).Times(AnyNumber());
   ASSERT_TRUE(RunAppTest("api_test/usb/invalid_length_transfer"));
@@ skipping 42 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