Merge components/usb_service into device/usb.

device/usb/usb_device.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_H_
-#define COMPONENTS_USB_SERVICE_USB_DEVICE_H_
+#ifndef DEVICE_USB_USB_DEVICE_H_
+#define DEVICE_USB_USB_DEVICE_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
-#include "components/usb_service/usb_service_export.h"
 
-namespace usb_service {
+namespace device {
 
 class UsbDeviceHandle;
 class UsbConfigDescriptor;
 
 // A UsbDevice object represents a detected USB device, providing basic
 // information about it. For further manipulation of the device, a
 // UsbDeviceHandle must be created from Open() method.
-class USB_SERVICE_EXPORT UsbDevice
-    : public base::RefCountedThreadSafe<UsbDevice> {
+class UsbDevice : public base::RefCountedThreadSafe<UsbDevice> {
  public:
   // Accessors to basic information.
   uint16 vendor_id() const { return vendor_id_; }
   uint16 product_id() const { return product_id_; }
   uint32 unique_id() const { return unique_id_; }
 
 #if defined(OS_CHROMEOS)
   // On ChromeOS, if an interface of a claimed device is not claimed, the
   // permission broker can change the owner of the device so that the unclaimed
   // interfaces can be used. If this argument is missing, permission broker will
@@ skipping 27 matching lines @@
  private:
   friend class base::RefCountedThreadSafe<UsbDevice>;
 
   const uint16 vendor_id_;
   const uint16 product_id_;
   const uint32 unique_id_;
 
   DISALLOW_COPY_AND_ASSIGN(UsbDevice);
 };
 
-}  // namespace usb_service
+}  // namespace device
 
-#endif  // COMPONENTS_USB_SERVICE_USB_DEVICE_H_
+#endif  // DEVICE_USB_USB_DEVICE_H_