Merge components/usb_service into device/usb.

device/usb/usb_device_impl.h

 // 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.
 
-#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;
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
-namespace usb_service {
+namespace device {
 
 class UsbDeviceHandleImpl;
 class UsbContext;
 
 typedef libusb_device* PlatformUsbDevice;
 typedef libusb_config_descriptor* PlatformUsbConfigDescriptor;
 
 class UsbDeviceImpl : public UsbDevice {
  public:
 // UsbDevice implementation:
@@ skipping 32 matching lines @@
   // Opened handles.
   typedef std::vector<scoped_refptr<UsbDeviceHandleImpl> > HandlesVector;
   HandlesVector handles_;
 
   // Reference to the UI thread for permission-broker calls.
   scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
 
   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_