Merge components/usb_service into device/usb.

Unify these two parts of out USB device support. The //device tree is
the cannonical location for hardware device APIs.

BUG=

Review URL: https://codereview.chromium.org/497363004

Cr-Commit-Position: refs/heads/master@{#293246}

2 files changed, 4 insertions, 6 deletions

diff --git a/device/core/device_client.cc b/device/core/device_client.cc
index ad96b1e..f92ec17 100644
--- a/device/core/device_client.cc
+++ b/device/core/device_client.cc
@@ -29,7 +29,7 @@ DeviceClient* DeviceClient::Get() {
   return g_instance;
 }
 
-usb_service::UsbService* DeviceClient::GetUsbService() {
+UsbService* DeviceClient::GetUsbService() {
   // This should never be called by clients which do not support the USB API.
   NOTREACHED();
   return NULL;
diff --git a/device/core/device_client.h b/device/core/device_client.h
index d8d938b..3ca3130 100644
--- a/device/core/device_client.h
+++ b/device/core/device_client.h
@@ -7,12 +7,10 @@
 
 #include "base/macros.h"
 
-namespace usb_service {
-class UsbService;
-}
-
 namespace device {
 
+class UsbService;
+
 // Interface used by consumers of //device APIs to get pointers to the service
 // singletons appropriate for a given embedding application. For an example see
 // //chrome/browser/chrome_device_client.h.
@@ -28,7 +26,7 @@ class DeviceClient {
   static DeviceClient* Get();
 
   // Returns the UsbService instance for this embedder.
-  virtual usb_service::UsbService* GetUsbService();
+  virtual UsbService* GetUsbService();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DeviceClient);