Use Mojo enum types in the C++ USB interface

device/usb/webusb_descriptors_unittest.cc

 // Copyright 2015 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 "device/usb/webusb_descriptors.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 57 matching lines @@
                                           'm',  'p',  'l',  'e', '.', 'c',
                                           'o',  'm',  ':',  '8', '4'};
 
 const uint8_t kExampleUrlDescriptor6[] = {0x11, 0x03, 0x01, 'e', 'x', 'a',
                                           'm',  'p',  'l',  'e', '.', 'c',
                                           'o',  'm',  ':',  '8', '5'};
 
 ACTION_P2(InvokeCallback, data, length) {
   size_t transferred_length = std::min(length, arg7);
   memcpy(arg6->data(), data, transferred_length);
-  arg9.Run(USB_TRANSFER_COMPLETED, arg6, transferred_length);
+  arg9.Run(UsbTransferStatus::COMPLETED, arg6, transferred_length);
 }
 
 void ExpectAllowedOriginsAndLandingPage(
     std::unique_ptr<WebUsbAllowedOrigins> allowed_origins,
     const GURL& landing_page) {
   EXPECT_EQ(GURL("https://example.com/index.html"), landing_page);
   ASSERT_TRUE(allowed_origins);
   ASSERT_EQ(2u, allowed_origins->origins.size());
   EXPECT_EQ(GURL("https://example.com"), allowed_origins->origins[0]);
   EXPECT_EQ(GURL("https://example.com:81"), allowed_origins->origins[1]);
@@ skipping 311 matching lines @@
   GURL url;
   ASSERT_FALSE(ParseWebUsbUrlDescriptor(
       std::vector<uint8_t>(kBuffer, kBuffer + sizeof(kBuffer)), &url));
 }
 
 TEST_F(WebUsbDescriptorsTest, ReadDescriptors) {
   scoped_refptr<MockUsbDeviceHandle> device_handle(
       new MockUsbDeviceHandle(nullptr));
 
   EXPECT_CALL(*device_handle,
-              ControlTransfer(USB_DIRECTION_INBOUND, UsbDeviceHandle::STANDARD,
-                              UsbDeviceHandle::DEVICE, 0x06, 0x0F00, 0x0000, _,
-                              _, _, _))
+              ControlTransfer(UsbTransferDirection::INBOUND,
+                              UsbControlTransferType::STANDARD,
+                              UsbControlTransferRecipient::DEVICE, 0x06, 0x0F00,
+                              0x0000, _, _, _, _))
       .Times(2)
       .WillRepeatedly(
           InvokeCallback(kExampleBosDescriptor, sizeof(kExampleBosDescriptor)));
   EXPECT_CALL(*device_handle,
-              ControlTransfer(USB_DIRECTION_INBOUND, UsbDeviceHandle::VENDOR,
-                              UsbDeviceHandle::DEVICE, 0x42, 0x0000, 0x0001, _,
-                              _, _, _))
+              ControlTransfer(UsbTransferDirection::INBOUND,
+                              UsbControlTransferType::VENDOR,
+                              UsbControlTransferRecipient::DEVICE, 0x42, 0x0000,
+                              0x0001, _, _, _, _))
       .Times(2)
       .WillRepeatedly(InvokeCallback(kExampleAllowedOrigins,
                                      sizeof(kExampleAllowedOrigins)));
   EXPECT_CALL(*device_handle,
-              ControlTransfer(USB_DIRECTION_INBOUND, UsbDeviceHandle::VENDOR,
-                              UsbDeviceHandle::DEVICE, 0x42, 0x0001, 0x0002, _,
-                              _, _, _))
+              ControlTransfer(UsbTransferDirection::INBOUND,
+                              UsbControlTransferType::VENDOR,
+                              UsbControlTransferRecipient::DEVICE, 0x42, 0x0001,
+                              0x0002, _, _, _, _))
       .WillOnce(InvokeCallback(kExampleUrlDescriptor1,
                                sizeof(kExampleUrlDescriptor1)));
   EXPECT_CALL(*device_handle,
-              ControlTransfer(USB_DIRECTION_INBOUND, UsbDeviceHandle::VENDOR,
-                              UsbDeviceHandle::DEVICE, 0x42, 0x0002, 0x0002, _,
-                              _, _, _))
+              ControlTransfer(UsbTransferDirection::INBOUND,
+                              UsbControlTransferType::VENDOR,
+                              UsbControlTransferRecipient::DEVICE, 0x42, 0x0002,
+                              0x0002, _, _, _, _))
       .WillOnce(InvokeCallback(kExampleUrlDescriptor2,
                                sizeof(kExampleUrlDescriptor2)));
   EXPECT_CALL(*device_handle,
-              ControlTransfer(USB_DIRECTION_INBOUND, UsbDeviceHandle::VENDOR,
-                              UsbDeviceHandle::DEVICE, 0x42, 0x0003, 0x0002, _,
-                              _, _, _))
+              ControlTransfer(UsbTransferDirection::INBOUND,
+                              UsbControlTransferType::VENDOR,
+                              UsbControlTransferRecipient::DEVICE, 0x42, 0x0003,
+                              0x0002, _, _, _, _))
       .WillOnce(InvokeCallback(kExampleUrlDescriptor3,
                                sizeof(kExampleUrlDescriptor3)));
   EXPECT_CALL(*device_handle,
-              ControlTransfer(USB_DIRECTION_INBOUND, UsbDeviceHandle::VENDOR,
-                              UsbDeviceHandle::DEVICE, 0x42, 0x0004, 0x0002, _,
-                              _, _, _))
+              ControlTransfer(UsbTransferDirection::INBOUND,
+                              UsbControlTransferType::VENDOR,
+                              UsbControlTransferRecipient::DEVICE, 0x42, 0x0004,
+                              0x0002, _, _, _, _))
       .WillOnce(InvokeCallback(kExampleUrlDescriptor4,
                                sizeof(kExampleUrlDescriptor4)));
   EXPECT_CALL(*device_handle,
-              ControlTransfer(USB_DIRECTION_INBOUND, UsbDeviceHandle::VENDOR,
-                              UsbDeviceHandle::DEVICE, 0x42, 0x0005, 0x0002, _,
-                              _, _, _))
+              ControlTransfer(UsbTransferDirection::INBOUND,
+                              UsbControlTransferType::VENDOR,
+                              UsbControlTransferRecipient::DEVICE, 0x42, 0x0005,
+                              0x0002, _, _, _, _))
       .WillOnce(InvokeCallback(kExampleUrlDescriptor5,
                                sizeof(kExampleUrlDescriptor5)));
   EXPECT_CALL(*device_handle,
-              ControlTransfer(USB_DIRECTION_INBOUND, UsbDeviceHandle::VENDOR,
-                              UsbDeviceHandle::DEVICE, 0x42, 0x0006, 0x0002, _,
-                              _, _, _))
+              ControlTransfer(UsbTransferDirection::INBOUND,
+                              UsbControlTransferType::VENDOR,
+                              UsbControlTransferRecipient::DEVICE, 0x42, 0x0006,
+                              0x0002, _, _, _, _))
       .WillOnce(InvokeCallback(kExampleUrlDescriptor6,
                                sizeof(kExampleUrlDescriptor6)));
 
   ReadWebUsbDescriptors(device_handle,
                         base::Bind(&ExpectAllowedOriginsAndLandingPage));
 }
 
 }  // namespace
 
 }  // namespace device