Merge components/usb_service into device/usb.

device/usb/usb_interface_impl.cc

 // 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.
 
-#include "components/usb_service/usb_interface_impl.h"
+#include "device/usb/usb_interface_impl.h"
 
 #include "base/logging.h"
 #include "third_party/libusb/src/libusb/libusb.h"
 
-namespace usb_service {
+namespace device {
 
 UsbEndpointDescriptorImpl::UsbEndpointDescriptorImpl(
     scoped_refptr<const UsbConfigDescriptor> config,
     PlatformUsbEndpointDescriptor descriptor)
     : config_(config), descriptor_(descriptor) {
 }
 
 UsbEndpointDescriptorImpl::~UsbEndpointDescriptorImpl() {
 }
 
@@ skipping 10 matching lines @@
     default:
       NOTREACHED();
       return USB_DIRECTION_INBOUND;
   }
 }
 
 int UsbEndpointDescriptorImpl::GetMaximumPacketSize() const {
   return descriptor_->wMaxPacketSize;
 }
 
-UsbSynchronizationType
-    UsbEndpointDescriptorImpl::GetSynchronizationType() const {
+UsbSynchronizationType UsbEndpointDescriptorImpl::GetSynchronizationType()
+    const {
   switch (descriptor_->bmAttributes & LIBUSB_ISO_SYNC_TYPE_MASK) {
     case LIBUSB_ISO_SYNC_TYPE_NONE:
       return USB_SYNCHRONIZATION_NONE;
     case LIBUSB_ISO_SYNC_TYPE_ASYNC:
       return USB_SYNCHRONIZATION_ASYNCHRONOUS;
     case LIBUSB_ISO_SYNC_TYPE_ADAPTIVE:
       return USB_SYNCHRONIZATION_ADAPTIVE;
     case LIBUSB_ISO_SYNC_TYPE_SYNC:
       return USB_SYNCHRONIZATION_SYNCHRONOUS;
     default:
@@ skipping 101 matching lines @@
 
 UsbConfigDescriptorImpl::~UsbConfigDescriptorImpl() {
   libusb_free_config_descriptor(config_);
 }
 
 size_t UsbConfigDescriptorImpl::GetNumInterfaces() const {
   return config_->bNumInterfaces;
 }
 
 scoped_refptr<const UsbInterfaceDescriptor>
-    UsbConfigDescriptorImpl::GetInterface(size_t index) const {
+UsbConfigDescriptorImpl::GetInterface(size_t index) const {
   return new UsbInterfaceDescriptorImpl(this, &config_->interface[index]);
 }
 
-}  // namespace usb_service
+}  // namespace device