Merge components/usb_service into device/usb.

device/usb/usb_context.h

Index: device/usb/usb_context.h
diff --git a/components/usb_service/usb_context.h b/device/usb/usb_context.h
similarity index 74%
rename from components/usb_service/usb_context.h
rename to device/usb/usb_context.h
index 73e4ee654e73781238975704bd493185207f8a20..b628b4bfafb01d55828c823167d22aa7088a1ddf 100644
--- a/components/usb_service/usb_context.h
+++ b/device/usb/usb_context.h
@@ -2,18 +2,17 @@
 // 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_CONTEXT_H_
-#define COMPONENTS_USB_SERVICE_USB_CONTEXT_H_
+#ifndef DEVICE_USB_USB_CONTEXT_H_
+#define DEVICE_USB_USB_CONTEXT_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread_checker.h"
-#include "components/usb_service/usb_service_export.h"
 
 struct libusb_context;
 
-namespace usb_service {
+namespace device {
 
 typedef libusb_context* PlatformUsbContext;
 
@@ -21,8 +20,7 @@ typedef libusb_context* PlatformUsbContext;
 // It also manages the life-cycle of UsbEventHandler.
 // It is a blocking operation to delete UsbContext.
 // Destructor must be called on FILE thread.
-class USB_SERVICE_EXPORT UsbContext
-    : public base::RefCountedThreadSafe<UsbContext> {
+class UsbContext : public base::RefCountedThreadSafe<UsbContext> {
  public:
   PlatformUsbContext context() const { return context_; }
 
@@ -42,6 +40,6 @@ class USB_SERVICE_EXPORT UsbContext
   DISALLOW_COPY_AND_ASSIGN(UsbContext);
 };
 
-}  // namespace usb_service
+}  // namespace device
 
-#endif  // COMPONENTS_USB_SERVICE_USB_CONTEXT_H_
+#endif  // DEVICE_USB_USB_CONTEXT_H_