Merge components/usb_service into device/usb.

extensions/browser/api/usb/usb_device_resource.h

Index: extensions/browser/api/usb/usb_device_resource.h
diff --git a/extensions/browser/api/usb/usb_device_resource.h b/extensions/browser/api/usb/usb_device_resource.h
index cb6cbbe308edf25fae3bd35fae201d95c2f23767..dfa4bf4dc6d7f33e1600258b2848b40c1619362f 100644
--- a/extensions/browser/api/usb/usb_device_resource.h
+++ b/extensions/browser/api/usb/usb_device_resource.h
@@ -12,8 +12,8 @@
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
-#include "components/usb_service/usb_device_handle.h"
 #include "content/public/browser/browser_thread.h"
+#include "device/usb/usb_device_handle.h"
 #include "extensions/browser/api/api_resource.h"
 #include "extensions/browser/api/api_resource_manager.h"
 #include "extensions/common/api/usb.h"
@@ -28,10 +28,10 @@ namespace extensions {
 class UsbDeviceResource : public ApiResource {
  public:
   UsbDeviceResource(const std::string& owner_extension_id,
-                    scoped_refptr<usb_service::UsbDeviceHandle> device);
+                    scoped_refptr<device::UsbDeviceHandle> device);
   virtual ~UsbDeviceResource();
 
-  scoped_refptr<usb_service::UsbDeviceHandle> device() { return device_; }
+  scoped_refptr<device::UsbDeviceHandle> device() { return device_; }
 
   static const content::BrowserThread::ID kThreadId =
       content::BrowserThread::FILE;
@@ -40,7 +40,7 @@ class UsbDeviceResource : public ApiResource {
   friend class ApiResourceManager<UsbDeviceResource>;
   static const char* service_name() { return "UsbDeviceResourceManager"; }
 
-  scoped_refptr<usb_service::UsbDeviceHandle> device_;
+  scoped_refptr<device::UsbDeviceHandle> device_;
 
   DISALLOW_COPY_AND_ASSIGN(UsbDeviceResource);
 };