Merge components/usb_service into device/usb.

device/usb/usb_device_filter.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/usb_service/usb_device_filter.h"
+#include "device/usb/usb_device_filter.h"
 
 #include "base/values.h"
-#include "components/usb_service/usb_device.h"
-#include "components/usb_service/usb_interface.h"
+#include "device/usb/usb_device.h"
+#include "device/usb/usb_interface.h"
 
-namespace usb_service {
+namespace device {
 
 namespace {
 
 const char kProductIdKey[] = "productId";
 const char kVendorIdKey[] = "vendorId";
 const char kInterfaceClassKey[] = "interfaceClass";
 const char kInterfaceSubclassKey[] = "interfaceSubclass";
 const char kInterfaceProtocolKey[] = "interfaceProtocol";
 
 }  // namespace
@@ skipping 108 matching lines @@
   for (std::vector<UsbDeviceFilter>::const_iterator i = filters.begin();
        i != filters.end();
        ++i) {
     if (i->Matches(device)) {
       return true;
     }
   }
   return false;
 }
 
-}  // namespace usb_service
+}  // namespace device