Merge components/usb_service into device/usb.

device/usb/usb_device_impl.h

Index: device/usb/usb_device_impl.h
diff --git a/components/usb_service/usb_device_impl.h b/device/usb/usb_device_impl.h
similarity index 88%
rename from components/usb_service/usb_device_impl.h
rename to device/usb/usb_device_impl.h
index 07711bc2e54f3c6ba947424853bc7a8af58a168a..1ece2e0b17e784ba9803e9032ba4c0ad24106828 100644
--- a/components/usb_service/usb_device_impl.h
+++ b/device/usb/usb_device_impl.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_USB_SERVICE_USB_DEVICE_IMPL_H_
-#define COMPONENTS_USB_SERVICE_USB_DEVICE_IMPL_H_
+#ifndef DEVICE_USB_USB_DEVICE_IMPL_H_
+#define DEVICE_USB_USB_DEVICE_IMPL_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/threading/thread_checker.h"
-#include "components/usb_service/usb_device.h"
+#include "device/usb/usb_device.h"
 
 struct libusb_device;
 struct libusb_config_descriptor;
@@ -19,7 +19,7 @@ namespace base {
 class SingleThreadTaskRunner;
 }
 
-namespace usb_service {
+namespace device {
 
 class UsbDeviceHandleImpl;
 class UsbContext;
@@ -72,6 +72,6 @@ class UsbDeviceImpl : public UsbDevice {
   DISALLOW_COPY_AND_ASSIGN(UsbDeviceImpl);
 };
 
-}  // namespace usb_service
+}  // namespace device
 
-#endif  // COMPONENTS_USB_SERVICE_USB_DEVICE_IMPL_H_
+#endif  // DEVICE_USB_USB_DEVICE_IMPL_H_