1 files changed, 32 insertions, 24 deletions

diff --git a/chrome/browser/extensions/api/usb/usb_apitest.cc b/chrome/browser/extensions/api/usb/usb_apitest.cc
index 55ed901..20f37d9 100644
--- a/chrome/browser/extensions/api/usb/usb_apitest.cc
+++ b/chrome/browser/extensions/api/usb/usb_apitest.cc
@@ -95,60 +95,68 @@ class UsbApiTest : public ExtensionApiTest {
 }  // namespace
 
 IN_PROC_BROWSER_TEST_F(UsbApiTest, DeviceHandling) {
-  EXPECT_CALL(*mock_device_, Close(_))
+  EXPECT_CALL(*mock_device_.get(), Close(_))
       .WillRepeatedly(InvokeUsbCallback());
-  EXPECT_CALL(*mock_device_, ResetDevice(_))
-    .WillOnce(InvokeUsbResultCallback<0>(true))
-    .WillOnce(InvokeUsbResultCallback<0>(false));
-  EXPECT_CALL(*mock_device_,
+  EXPECT_CALL(*mock_device_.get(), ResetDevice(_))
+      .WillOnce(InvokeUsbResultCallback<0>(true))
+      .WillOnce(InvokeUsbResultCallback<0>(false));
+  EXPECT_CALL(*mock_device_.get(),
               InterruptTransfer(USB_DIRECTION_OUTBOUND, 2, _, 1, _, _))
-    .WillOnce(InvokeUsbTransferCallback<5>(USB_TRANSFER_COMPLETED));
+      .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());
+  EXPECT_CALL(*mock_device_.get(), ListInterfaces(_, _))
+      .WillOnce(InvokeUsbResultCallback<1>(false));
+  EXPECT_CALL(*mock_device_.get(), Close(_)).Times(AnyNumber());
   ASSERT_TRUE(RunExtensionTest("usb/list_interfaces"));
 }
 
 IN_PROC_BROWSER_TEST_F(UsbApiTest, TransferEvent) {
-  EXPECT_CALL(*mock_device_,
-      ControlTransfer(USB_DIRECTION_OUTBOUND, UsbDevice::STANDARD,
-          UsbDevice::DEVICE, 1, 2, 3, _, 1, _, _))
+  EXPECT_CALL(*mock_device_.get(),
+              ControlTransfer(USB_DIRECTION_OUTBOUND,
+                              UsbDevice::STANDARD,
+                              UsbDevice::DEVICE,
+                              1,
+                              2,
+                              3,
+                              _,
+                              1,
+                              _,
+                              _))
       .WillOnce(InvokeUsbTransferCallback<9>(USB_TRANSFER_COMPLETED));
-  EXPECT_CALL(*mock_device_,
-      BulkTransfer(USB_DIRECTION_OUTBOUND, 1, _, 1, _, _))
+  EXPECT_CALL(*mock_device_.get(),
+              BulkTransfer(USB_DIRECTION_OUTBOUND, 1, _, 1, _, _))
       .WillOnce(InvokeUsbTransferCallback<5>(USB_TRANSFER_COMPLETED));
-  EXPECT_CALL(*mock_device_,
-      InterruptTransfer(USB_DIRECTION_OUTBOUND, 2, _, 1, _, _))
+  EXPECT_CALL(*mock_device_.get(),
+              InterruptTransfer(USB_DIRECTION_OUTBOUND, 2, _, 1, _, _))
       .WillOnce(InvokeUsbTransferCallback<5>(USB_TRANSFER_COMPLETED));
-  EXPECT_CALL(*mock_device_,
-      IsochronousTransfer(USB_DIRECTION_OUTBOUND, 3, _, 1, 1, 1, _, _))
+  EXPECT_CALL(*mock_device_.get(),
+              IsochronousTransfer(USB_DIRECTION_OUTBOUND, 3, _, 1, 1, 1, _, _))
       .WillOnce(InvokeUsbTransferCallback<7>(USB_TRANSFER_COMPLETED));
-  EXPECT_CALL(*mock_device_, Close(_)).Times(AnyNumber());
+  EXPECT_CALL(*mock_device_.get(), Close(_)).Times(AnyNumber());
   ASSERT_TRUE(RunExtensionTest("usb/transfer_event"));
 }
 
 IN_PROC_BROWSER_TEST_F(UsbApiTest, ZeroLengthTransfer) {
-  EXPECT_CALL(*mock_device_, BulkTransfer(_, _, _, 0, _, _))
+  EXPECT_CALL(*mock_device_.get(), BulkTransfer(_, _, _, 0, _, _))
       .WillOnce(InvokeUsbTransferCallback<5>(USB_TRANSFER_COMPLETED));
-  EXPECT_CALL(*mock_device_, Close(_)).Times(AnyNumber());
+  EXPECT_CALL(*mock_device_.get(), Close(_)).Times(AnyNumber());
   ASSERT_TRUE(RunExtensionTest("usb/zero_length_transfer"));
 }
 
 IN_PROC_BROWSER_TEST_F(UsbApiTest, TransferFailure) {
-  EXPECT_CALL(*mock_device_, BulkTransfer(_, _, _, _, _, _))
+  EXPECT_CALL(*mock_device_.get(), 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());
+  EXPECT_CALL(*mock_device_.get(), Close(_)).Times(AnyNumber());
   ASSERT_TRUE(RunExtensionTest("usb/transfer_failure"));
 }
 
 IN_PROC_BROWSER_TEST_F(UsbApiTest, InvalidLengthTransfer) {
-  EXPECT_CALL(*mock_device_, Close(_)).Times(AnyNumber());
+  EXPECT_CALL(*mock_device_.get(), Close(_)).Times(AnyNumber());
   ASSERT_TRUE(RunExtensionTest("usb/invalid_length_transfer"));
 }