Merge components/usb_service into device/usb.

device/usb/usb_device_filter.h

Index: device/usb/usb_device_filter.h
diff --git a/components/usb_service/usb_device_filter.h b/device/usb/usb_device_filter.h
similarity index 77%
rename from components/usb_service/usb_device_filter.h
rename to device/usb/usb_device_filter.h
index 26911523c7c2c3223ab47474d50656e49647bfab..6525f8fdd81196ccd18e7797aae135b0fa8be53f 100644
--- a/components/usb_service/usb_device_filter.h
+++ b/device/usb/usb_device_filter.h
@@ -2,23 +2,22 @@
 // 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_DEVICE_FILTER_H_
-#define COMPONENTS_USB_SERVICE_USB_DEVICE_FILTER_H_
+#ifndef DEVICE_USB_USB_DEVICE_FILTER_H_
+#define DEVICE_USB_USB_DEVICE_FILTER_H_
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
-#include "components/usb_service/usb_service_export.h"
 
 namespace base {
 class Value;
 }
 
-namespace usb_service {
+namespace device {
 
 class UsbDevice;
 
-class USB_SERVICE_EXPORT UsbDeviceFilter {
+class UsbDeviceFilter {
  public:
   UsbDeviceFilter();
   ~UsbDeviceFilter();
@@ -48,6 +47,6 @@ class USB_SERVICE_EXPORT UsbDeviceFilter {
   bool interface_protocol_set_ : 1;
 };
 
-}  // namespace usb_service
+}  // namespace device
 
-#endif  // COMPONENTS_USB_SERVICE_USB_DEVICE_FILTER_H_
+#endif  // DEVICE_USB_USB_DEVICE_FILTER_H_