Merge components/usb_service into device/usb.

device/usb/usb_interface_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_INTERFACE_IMPL_H_
-#define COMPONENTS_USB_SERVICE_USB_INTERFACE_IMPL_H_
+#ifndef DEVICE_USB_USB_INTERFACE_IMPL_H_
+#define DEVICE_USB_USB_INTERFACE_IMPL_H_
 
 #include "base/memory/ref_counted.h"
-#include "components/usb_service/usb_interface.h"
-#include "components/usb_service/usb_service_export.h"
+#include "device/usb/usb_interface.h"
 
 struct libusb_config_descriptor;
 struct libusb_endpoint_descriptor;
 struct libusb_interface;
 struct libusb_interface_descriptor;
 
-namespace usb_service {
+namespace device {
 
 typedef libusb_config_descriptor* PlatformUsbConfigDescriptor;
 typedef const libusb_endpoint_descriptor* PlatformUsbEndpointDescriptor;
 typedef const libusb_interface* PlatformUsbInterface;
 typedef const libusb_interface_descriptor* PlatformUsbInterfaceDescriptor;
 
 class UsbConfigDescriptorImpl;
 class UsbInterfaceAltSettingDescriptor;
 
 class UsbEndpointDescriptorImpl : public UsbEndpointDescriptor {
  public:
   virtual int GetAddress() const OVERRIDE;
   virtual UsbEndpointDirection GetDirection() const OVERRIDE;
   virtual int GetMaximumPacketSize() const OVERRIDE;
   virtual UsbSynchronizationType GetSynchronizationType() const OVERRIDE;
   virtual UsbTransferType GetTransferType() const OVERRIDE;
   virtual UsbUsageType GetUsageType() const OVERRIDE;
   virtual int GetPollingInterval() const OVERRIDE;
 
  private:
   friend class base::RefCounted<const UsbEndpointDescriptorImpl>;
   friend class UsbInterfaceAltSettingDescriptorImpl;
 
   UsbEndpointDescriptorImpl(scoped_refptr<const UsbConfigDescriptor> config,
-                        PlatformUsbEndpointDescriptor descriptor);
+                            PlatformUsbEndpointDescriptor descriptor);
   virtual ~UsbEndpointDescriptorImpl();
 
   scoped_refptr<const UsbConfigDescriptor> config_;
   PlatformUsbEndpointDescriptor descriptor_;
 
   DISALLOW_COPY_AND_ASSIGN(UsbEndpointDescriptorImpl);
 };
 
 class UsbInterfaceAltSettingDescriptorImpl
     : public UsbInterfaceAltSettingDescriptor {
@@ skipping 53 matching lines @@
   friend class UsbDeviceImpl;
 
   explicit UsbConfigDescriptorImpl(PlatformUsbConfigDescriptor config);
   virtual ~UsbConfigDescriptorImpl();
 
   PlatformUsbConfigDescriptor config_;
 
   DISALLOW_COPY_AND_ASSIGN(UsbConfigDescriptorImpl);
 };
 
-}  // namespace usb_service;
+}  // namespace device
 
-#endif  // COMPONENTS_USB_SERVICE_USB_INTERFACE_IMPL_H_
+#endif  // DEVICE_USB_USB_INTERFACE_IMPL_H_