Separate usb device handle from usb device. (deprecate)

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 21 matching lines @@
   ::std::tr1::get<k>(args).Run(p1);
 }
 
 // MSVC erroneously thinks that at least one of the arguments for the transfer
 // methods differ by const or volatility and emits a warning about the old
 // standards-noncompliant behaviour of their compiler.
 #if defined(OS_WIN)
 #pragma warning(push)
 #pragma warning(disable:4373)
 #endif
-class MockUsbDevice : public UsbDevice {
+class MockUsbDevice : public UsbDeviceHandle {
  public:
-  MockUsbDevice() : UsbDevice() {}
+  MockUsbDevice() : UsbDeviceHandle() {}
 
   MOCK_METHOD1(Close, void(const base::Callback<void()>& callback));
 
   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 UsbEndpointDirection direction,
@@ skipping 54 matching lines @@
 IN_PROC_BROWSER_TEST_F(UsbApiTest, ListInterfaces) {
   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_.get(),
               ControlTransfer(USB_DIRECTION_OUTBOUND,
-                              UsbDevice::STANDARD,
-                              UsbDevice::DEVICE,
+                              UsbDeviceHandle::STANDARD,
+                              UsbDeviceHandle::DEVICE,
                               1,
                               2,
                               3,
                               _,
                               1,
                               _,
                               _))
       .WillOnce(InvokeUsbTransferCallback<9>(USB_TRANSFER_COMPLETED));
   EXPECT_CALL(*mock_device_.get(),
               BulkTransfer(USB_DIRECTION_OUTBOUND, 1, _, 1, _, _))
@@ skipping 22 matching lines @@
       .WillOnce(InvokeUsbTransferCallback<5>(USB_TRANSFER_TIMEOUT));
   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_.get(), Close(_)).Times(AnyNumber());
   ASSERT_TRUE(RunExtensionTest("usb/invalid_length_transfer"));
 }