Merge components/usb_service into device/usb.

extensions/shell/browser/shell_device_client.cc

Index: extensions/shell/browser/shell_device_client.cc
diff --git a/extensions/shell/browser/shell_device_client.cc b/extensions/shell/browser/shell_device_client.cc
index 3120c010d693d953227887fd3844702333145073..b3c81680c983db9fe5987bb3bfbfda3c3058a07e 100644
--- a/extensions/shell/browser/shell_device_client.cc
+++ b/extensions/shell/browser/shell_device_client.cc
@@ -5,8 +5,8 @@
 #include "extensions/shell/browser/shell_device_client.h"
 
 #include "base/logging.h"
-#include "components/usb_service/usb_service.h"
 #include "content/public/browser/browser_thread.h"
+#include "device/usb/usb_service.h"
 
 namespace extensions {
 
@@ -14,8 +14,8 @@ ShellDeviceClient::ShellDeviceClient() {}
 
 ShellDeviceClient::~ShellDeviceClient() {}
 
-usb_service::UsbService* ShellDeviceClient::GetUsbService() {
-  return usb_service::UsbService::GetInstance(
+device::UsbService* ShellDeviceClient::GetUsbService() {
+  return device::UsbService::GetInstance(
       content::BrowserThread::GetMessageLoopProxyForThread(
           content::BrowserThread::UI));
 }