Merge components/usb_service into device/usb.

device/core/device_client.h

Index: device/core/device_client.h
diff --git a/device/core/device_client.h b/device/core/device_client.h
index d8d938b26842ea91ae92eae931a1906a74519db3..3ca3130c0ad455412a170cfa598230f3039397d5 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);