Merge components/usb_service into device/usb.

components/components_tests.gyp

 # 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.
 
 {
   'variables': {
     # This turns on e.g. the filename-based detection of which
     # platforms to include source files on (e.g. files ending in
     # _mac.h or _mac.cc are only compiled on MacOSX).
     'chromium_code': 1,
@@ skipping 415 matching lines @@
             ['toolkit_views == 1', {
               'sources': [
                 'bookmarks/browser/bookmark_node_data_unittest.cc',
               ],
             }],
             ['OS != "ios"', {
               'sources': [
                 'autofill/content/renderer/renderer_save_password_progress_logger_unittest.cc',
                 'dom_distiller/content/dom_distiller_viewer_source_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
                 'components.gyp:autofill_content_browser',
                 'components.gyp:autofill_content_renderer',
                 'components.gyp:autofill_content_test_support',
                 
                 # Dependencies of component_updater
                 'components.gyp:component_updater',
                 'components.gyp:component_updater_test_support',
@@ skipping 21 matching lines @@
                 'components.gyp:sessions',
                 'components.gyp:sessions_test_support',
 
                 # Dependencies of storage monitor
                 'components.gyp:storage_monitor',
                 'components.gyp:storage_monitor_test_support',
 
                 # 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',
 
                 # Dependencies of web_modal
                 'components.gyp:web_modal',
                 'components.gyp:web_modal_test_support',
               ],
             }, { # 'OS == "ios"'
               'includes': ['../chrome/chrome_ios_bundle_resources.gypi'],
@@ skipping 93 matching lines @@
                 'gcm_driver/gcm_client_impl_unittest.cc',
                 'gcm_driver/gcm_driver_desktop_unittest.cc',
                 'feedback/feedback_common_unittest.cc',
                 'feedback/feedback_data_unittest.cc',
                 'feedback/feedback_uploader_unittest.cc',
                 'gcm_driver/gcm_stats_recorder_impl_unittest.cc',
                 'signin/core/browser/mutable_profile_oauth2_token_service_unittest.cc',
                 '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': [
                 '../testing/android/native_test.gyp:native_test_native_code',
               ],
               'dependencies!': [
                 '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"', {
               'sources': [
                 'invalidation/fake_invalidator_unittest.cc',
                 'invalidation/gcm_network_channel_unittest.cc',
                 'invalidation/invalidation_notifier_unittest.cc',
                 'invalidation/invalidator_registrar_unittest.cc',
                 'invalidation/non_blocking_invalidator_unittest.cc',
                 'invalidation/object_id_invalidation_map_unittest.cc',
@@ skipping 40 matching lines @@
                 'metrics/serialization/serialization_utils_unittest.cc',
               ],
               'dependencies': [
                 'components.gyp:metrics_serialization',
                 '../dbus/dbus.gyp:dbus',
                 '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol',
               ],
             }],
             ['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', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
             ['OS=="linux" and component=="shared_library" and use_allocator!="none"', {
             'dependencies': [
                 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
@@ skipping 245 matching lines @@
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }