Merge components/usb_service into device/usb.

device/usb/usb_service.h

Index: device/usb/usb_service.h
diff --git a/components/usb_service/usb_service.h b/device/usb/usb_service.h
similarity index 83%
rename from components/usb_service/usb_service.h
rename to device/usb/usb_service.h
index 11eac1aafbd3d6e69721fb50e65722eced90ada3..0d49c2f421d52b8a48fcb8062db714103b67ee81 100644
--- a/components/usb_service/usb_service.h
+++ b/device/usb/usb_service.h
@@ -2,21 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_USB_SERVICE_USB_SERVICE_H_
-#define COMPONENTS_USB_SERVICE_USB_SERVICE_H_
+#ifndef DEVICE_USB_USB_SERVICE_H_
+#define DEVICE_USB_USB_SERVICE_H_
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
-#include "components/usb_service/usb_service_export.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
-namespace usb_service {
+namespace device {
 
 class UsbDevice;
 
@@ -24,7 +23,7 @@ class UsbDevice;
 // used to manage and dispatch USB events. It is also responsible for device
 // discovery on the system, which allows it to re-use device handles to prevent
 // competition for the same USB device.
-class USB_SERVICE_EXPORT UsbService : public base::NonThreadSafe {
+class UsbService : public base::NonThreadSafe {
  public:
   // Must be called on a thread with a MessageLoopForIO (for example
   // BrowserThread::FILE). The UI task runner reference is used to talk to the
@@ -49,6 +48,6 @@ class USB_SERVICE_EXPORT UsbService : public base::NonThreadSafe {
   DISALLOW_COPY_AND_ASSIGN(UsbService);
 };
 
-}  // namespace usb_service
+}  // namespace device
 
-#endif  // COMPONENTS_USB_SERVICE_USB_SERVICE_H_
+#endif  // DEVICE_USB_USB_SERVICE_H_