Merge components/usb_service into device/usb.

extensions/browser/api/usb/usb_api.h

Index: extensions/browser/api/usb/usb_api.h
diff --git a/extensions/browser/api/usb/usb_api.h b/extensions/browser/api/usb/usb_api.h
index 3dd0d2b5d5e6b022b56e3e7eca16b9d86484a318..956136cbdc1da3c3defeac38f918f4628133e955 100644
--- a/extensions/browser/api/usb/usb_api.h
+++ b/extensions/browser/api/usb/usb_api.h
@@ -10,8 +10,8 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "components/usb_service/usb_device.h"
-#include "components/usb_service/usb_device_handle.h"
+#include "device/usb/usb_device.h"
+#include "device/usb/usb_device_handle.h"
 #include "extensions/browser/api/api_resource_manager.h"
 #include "extensions/browser/api/async_api_function.h"
 #include "extensions/common/api/usb.h"
@@ -31,13 +31,11 @@ class UsbAsyncApiFunction : public AsyncApiFunction {
   virtual bool PrePrepare() OVERRIDE;
   virtual bool Respond() OVERRIDE;
 
-  scoped_refptr<usb_service::UsbDevice> GetDeviceOrOrCompleteWithError(
+  scoped_refptr<device::UsbDevice> GetDeviceOrOrCompleteWithError(
       const extensions::core_api::usb::Device& input_device);
 
-  scoped_refptr<usb_service::UsbDeviceHandle>
-      GetDeviceHandleOrCompleteWithError(
-          const extensions::core_api::usb::ConnectionHandle&
-              input_device_handle);
+  scoped_refptr<device::UsbDeviceHandle> GetDeviceHandleOrCompleteWithError(
+      const extensions::core_api::usb::ConnectionHandle& input_device_handle);
 
   void RemoveUsbDeviceResource(int api_resource_id);
 
@@ -52,15 +50,15 @@ class UsbAsyncApiTransferFunction : public UsbAsyncApiFunction {
   virtual ~UsbAsyncApiTransferFunction();
 
   bool ConvertDirectionSafely(const extensions::core_api::usb::Direction& input,
-                              usb_service::UsbEndpointDirection* output);
+                              device::UsbEndpointDirection* output);
   bool ConvertRequestTypeSafely(
       const extensions::core_api::usb::RequestType& input,
-      usb_service::UsbDeviceHandle::TransferRequestType* output);
+      device::UsbDeviceHandle::TransferRequestType* output);
   bool ConvertRecipientSafely(
       const extensions::core_api::usb::Recipient& input,
-      usb_service::UsbDeviceHandle::TransferRecipient* output);
+      device::UsbDeviceHandle::TransferRecipient* output);
 
-  void OnCompleted(usb_service::UsbTransferStatus status,
+  void OnCompleted(device::UsbTransferStatus status,
                    scoped_refptr<net::IOBuffer> data,
                    size_t length);
 };
@@ -79,9 +77,9 @@ class UsbFindDevicesFunction : public UsbAsyncApiFunction {
 
  private:
   void OpenDevices(
-      scoped_ptr<std::vector<scoped_refptr<usb_service::UsbDevice> > > devices);
+      scoped_ptr<std::vector<scoped_refptr<device::UsbDevice> > > devices);
 
-  std::vector<scoped_refptr<usb_service::UsbDeviceHandle> > device_handles_;
+  std::vector<scoped_refptr<device::UsbDeviceHandle> > device_handles_;
   scoped_ptr<extensions::core_api::usb::FindDevices::Params> parameters_;
 };
 
@@ -99,7 +97,7 @@ class UsbGetDevicesFunction : public UsbAsyncApiFunction {
 
  private:
   void EnumerationCompletedFileThread(
-      scoped_ptr<std::vector<scoped_refptr<usb_service::UsbDevice> > > devices);
+      scoped_ptr<std::vector<scoped_refptr<device::UsbDevice> > > devices);
 
   scoped_ptr<extensions::core_api::usb::GetDevices::Params> parameters_;
 };
@@ -135,7 +133,7 @@ class UsbOpenDeviceFunction : public UsbAsyncApiFunction {
   virtual ~UsbOpenDeviceFunction();
 
  private:
-  scoped_refptr<usb_service::UsbDeviceHandle> handle_;
+  scoped_refptr<device::UsbDeviceHandle> handle_;
   scoped_ptr<extensions::core_api::usb::OpenDevice::Params> parameters_;
 };
 
@@ -152,15 +150,15 @@ class UsbListInterfacesFunction : public UsbAsyncApiFunction {
   virtual void AsyncWorkStart() OVERRIDE;
 
  private:
-  bool ConvertDirectionSafely(const usb_service::UsbEndpointDirection& input,
+  bool ConvertDirectionSafely(const device::UsbEndpointDirection& input,
                               extensions::core_api::usb::Direction* output);
   bool ConvertSynchronizationTypeSafely(
-      const usb_service::UsbSynchronizationType& input,
+      const device::UsbSynchronizationType& input,
       extensions::core_api::usb::SynchronizationType* output);
   bool ConvertTransferTypeSafely(
-      const usb_service::UsbTransferType& input,
+      const device::UsbTransferType& input,
       extensions::core_api::usb::TransferType* output);
-  bool ConvertUsageTypeSafely(const usb_service::UsbUsageType& input,
+  bool ConvertUsageTypeSafely(const device::UsbUsageType& input,
                               extensions::core_api::usb::UsageType* output);
 
   scoped_ptr<base::ListValue> result_;