Merge components/usb_service into device/usb.

components/components_tests.gyp

Index: components/components_tests.gyp
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index f4e8ae6b7652eeae26b4b633e159c386ff1a3d3e..f77747bbd02fdd6a9bb8573d42f1e8c1f86f82fd 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -430,8 +430,6 @@
                 'dom_distiller/content/dom_distiller_viewer_source_unittest.cc',
                 'password_manager/content/renderer/credential_manager_client_unittest.cc',
                 'power/origin_power_map_unittest.cc',
-                'usb_service/usb_context_unittest.cc',
-                'usb_service/usb_device_filter_unittest.cc',
               ],
               'dependencies': [
                 # Dependencies of autofill
@@ -477,10 +475,6 @@
                 # Dependencies of url_matcher.
                 'components.gyp:url_matcher',
 
-                # Dependencies of usb_service tests.
-                'components.gyp:usb_service',
-                '../third_party/libusb/libusb.gyp:libusb',
-
                 # Dependencies of visitedlink
                 'components.gyp:visitedlink_browser',
                 'components.gyp:visitedlink_renderer',
@@ -594,8 +588,6 @@
                 'storage_monitor/media_storage_util_unittest.cc',
                 'storage_monitor/storage_info_unittest.cc',
                 'storage_monitor/storage_monitor_unittest.cc',
-                'usb_service/usb_context_unittest.cc',
-                'usb_service/usb_device_filter_unittest.cc',
                 'web_modal/web_contents_modal_dialog_manager_unittest.cc',
               ],
               'dependencies': [
@@ -605,10 +597,8 @@
                 'components.gyp:feedback_component',
                 'components.gyp:storage_monitor',
                 'components.gyp:storage_monitor_test_support',
-                'components.gyp:usb_service',
                 'components.gyp:web_modal',
                 'components.gyp:web_modal_test_support',
-                '../third_party/libusb/libusb.gyp:libusb',
               ],
             }],
             ['OS != "android"', {
@@ -669,13 +659,11 @@
             }],
             ['OS=="linux" and use_udev==0', {
               'dependencies!': [
-                '../third_party/libusb/libusb.gyp:libusb',
                 'components.gyp:storage_monitor',
                 'components.gyp:storage_monitor_test_support',
               ],
               'sources/': [
                 ['exclude', '^storage_monitor/'],
-                ['exclude', '^usb_service/'],
               ],
             }],
             ['OS=="win" and win_use_allocator_shim==1', {