Merge components/usb_service into device/usb.

device/usb/usb_service_unittest.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 "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/usb_service/usb_device.h"
-#include "components/usb_service/usb_device_handle.h"
 #include "device/test/usb_test_gadget.h"
+#include "device/usb/usb_device.h"
+#include "device/usb/usb_device_handle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using ::usb_service::UsbDeviceHandle;
-
 namespace device {
 
 namespace {
 
 class UsbServiceTest : public ::testing::Test {
  public:
   virtual void SetUp() {
     message_loop_.reset(new base::MessageLoopForIO);
   }
 
@@ skipping 31 matching lines @@
 
   scoped_ptr<UsbTestGadget> gadget = UsbTestGadget::Claim();
   ASSERT_TRUE(gadget.get());
   ASSERT_TRUE(gadget->Disconnect());
   ASSERT_TRUE(gadget->Reconnect());
 }
 
 }  // namespace
 
 }  // namespace device