Merge components/usb_service into device/usb.

device/usb/usb_error.cc

Index: device/usb/usb_error.cc
diff --git a/components/usb_service/usb_error.cc b/device/usb/usb_error.cc
similarity index 65%
rename from components/usb_service/usb_error.cc
rename to device/usb/usb_error.cc
index d3e99601205a4c1384c96d811458588739419bdc..9fadb162edea7329dc842707412ec67ef8a6e00e 100644
--- a/components/usb_service/usb_error.cc
+++ b/device/usb/usb_error.cc
@@ -2,14 +2,14 @@
 // 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_error.h"
+#include "device/usb/usb_error.h"
 
 #include "third_party/libusb/src/libusb/libusb.h"
 
-namespace usb_service {
+namespace device {
 
-std::string ConvertErrorToString(int errcode) {
+std::string ConvertPlatformUsbErrorToString(int errcode) {
   return libusb_strerror(static_cast<libusb_error>(errcode));
 }
 
-}  // namespace usb_service;
+}  // namespace device