Merge components/usb_service into device/usb.

extensions/browser/api/usb_private/usb_private_api.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 "extensions/browser/api/usb_private/usb_private_api.h"
 
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/usb_service/usb_device_filter.h"
-#include "components/usb_service/usb_device_handle.h"
-#include "components/usb_service/usb_service.h"
 #include "device/core/device_client.h"
+#include "device/usb/usb_device_filter.h"
+#include "device/usb/usb_device_handle.h"
 #include "device/usb/usb_ids.h"
+#include "device/usb/usb_service.h"
 #include "extensions/common/api/usb_private.h"
 
 namespace usb_private = extensions::core_api::usb_private;
 namespace GetDevices = usb_private::GetDevices;
 namespace GetDeviceInfo = usb_private::GetDeviceInfo;
 
 using content::BrowserThread;
-using usb_service::UsbDevice;
-using usb_service::UsbDeviceFilter;
-using usb_service::UsbDeviceHandle;
-using usb_service::UsbService;
+using device::UsbDevice;
+using device::UsbDeviceFilter;
+using device::UsbDeviceHandle;
+using device::UsbService;
 
 namespace {
 
 const char kErrorInitService[] = "Failed to initialize USB service.";
 const char kErrorNoDevice[] = "No such device.";
 const char kErrorOpen[] = "Failed to open device.";
 
 }  // namespace
 
 namespace extensions {
@@ skipping 127 matching lines @@
 
   if (device_handle->GetSerial(&utf16)) {
     device_info.serial_string.reset(new std::string(base::UTF16ToUTF8(utf16)));
   }
 
   SetResult(device_info.ToValue().release());
   AsyncWorkCompleted();
 }
 
 }  // namespace extensions