Merge components/usb_service into device/usb.

device/usb/usb_error.h

Index: device/usb/usb_error.h
diff --git a/components/usb_service/usb_error.h b/device/usb/usb_error.h
similarity index 58%
rename from components/usb_service/usb_error.h
rename to device/usb/usb_error.h
index b718d676b26af4cb7fbc406c03d2e463c951803f..590c450cac6d04833d1338aa2d65303368d2ad53 100644
--- a/components/usb_service/usb_error.h
+++ b/device/usb/usb_error.h
@@ -2,17 +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_ERROR_H_
-#define COMPONENTS_USB_SERVICE_USB_ERROR_H_
+#ifndef DEVICE_USB_USB_ERROR_H_
+#define DEVICE_USB_USB_ERROR_H_
 
 #include <string>
 
-namespace usb_service {
+namespace device {
 
 // A number of libusb functions which return a member of enum libusb_error
 // return an int instead so for convenience this function takes an int.
-std::string ConvertErrorToString(int errcode);
+std::string ConvertPlatformUsbErrorToString(int errcode);
 
-}  // namespace usb_service;
+}  // namespace device
 
-#endif  // COMPONENTS_USB_SERVICE_USB_ERROR_H_
+#endif  // DEVICE_USB_USB_ERROR_H_