Merge components/usb_service into device/usb.

device/usb/usb_device_handle.h

Index: device/usb/usb_device_handle.h
diff --git a/components/usb_service/usb_device_handle.h b/device/usb/usb_device_handle.h
similarity index 90%
rename from components/usb_service/usb_device_handle.h
rename to device/usb/usb_device_handle.h
index 0115e64d17c123e2dae4341cc0637dfa2e915e58..be7de091ab0f6865a5ce5b81f0aa3dd5e6fa5621 100644
--- a/components/usb_service/usb_device_handle.h
+++ b/device/usb/usb_device_handle.h
@@ -2,8 +2,8 @@
 // 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_HANDLE_H_
-#define COMPONENTS_USB_SERVICE_USB_DEVICE_HANDLE_H_
+#ifndef DEVICE_USB_USB_DEVICE_HANDLE_H_
+#define DEVICE_USB_USB_DEVICE_HANDLE_H_
 
 #include <map>
 #include <vector>
@@ -12,11 +12,10 @@
 #include "base/memory/ref_counted.h"
 #include "base/strings/string16.h"
 #include "base/threading/thread_checker.h"
-#include "components/usb_service/usb_interface.h"
-#include "components/usb_service/usb_service_export.h"
+#include "device/usb/usb_interface.h"
 #include "net/base/io_buffer.h"
 
-namespace usb_service {
+namespace device {
 
 class UsbDevice;
 
@@ -36,8 +35,7 @@ typedef base::Callback<
     UsbTransferCallback;
 
 // UsbDeviceHandle class provides basic I/O related functionalities.
-class USB_SERVICE_EXPORT UsbDeviceHandle
-    : public base::RefCountedThreadSafe<UsbDeviceHandle> {
+class UsbDeviceHandle : public base::RefCountedThreadSafe<UsbDeviceHandle> {
  public:
   enum TransferRequestType { STANDARD, CLASS, VENDOR, RESERVED };
   enum TransferRecipient { DEVICE, INTERFACE, ENDPOINT, OTHER };
@@ -107,6 +105,6 @@ class USB_SERVICE_EXPORT UsbDeviceHandle
   DISALLOW_COPY_AND_ASSIGN(UsbDeviceHandle);
 };
 
-}  // namespace usb_service
+}  // namespace device
 
-#endif  // COMPONENTS_USB_SERVICE_USB_DEVICE_HANDLE_H_
+#endif  // DEVICE_USB_USB_DEVICE_HANDLE_H_