Remove dependency on //components/feedback on iOS

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 571 matching lines @@
             '<@(cloud_devices_unittest_sources)',
             '<@(content_settings_unittest_sources)',
             '<@(crash_unittest_sources)',
             '<@(crx_file_unittest_sources)',
             '<@(data_reduction_proxy_unittest_sources)',
             '<@(device_event_log_unittest_sources)',
             '<@(dom_distiller_unittest_sources)',
             '<@(domain_reliability_unittest_sources)',
             '<@(enhanced_bookmarks_unittest_sources)',
             '<@(favicon_base_unittest_sources)',
-            # This should be in the !android && !ios list, but has to be here
-            # due to a test bug making them order-dependent. crbug.com/462352
-            '<@(feedback_unittest_sources)',
             '<@(gcm_driver_unittest_sources)',
             '<@(google_unittest_sources)',
             '<@(history_unittest_sources)',
             '<@(json_schema_unittest_sources)',
             '<@(keyed_service_unittest_sources)',
             '<@(language_usage_metrics_unittest_sources)',
             '<@(leveldb_proto_unittest_sources)',
             '<@(login_unittest_sources)',
             '<@(metrics_unittest_sources)',
             '<@(network_time_unittest_sources)',
@@ skipping 67 matching lines @@
             'components.gyp:data_reduction_proxy_core_common',
             'components.gyp:data_reduction_proxy_test_support',
             'components.gyp:device_event_log_component',
             'components.gyp:distilled_page_proto',
             'components.gyp:dom_distiller_core',
             'components.gyp:dom_distiller_test_support',
             'components.gyp:domain_reliability',
             'components.gyp:enhanced_bookmarks',
             'components.gyp:enhanced_bookmarks_test_support',
             'components.gyp:favicon_base',
-            'components.gyp:feedback_component',
             'components.gyp:gcm_driver',
             'components.gyp:gcm_driver_test_support',
             'components.gyp:google_core_browser',
             'components.gyp:history_core_browser',
             'components.gyp:history_core_common',
             'components.gyp:history_core_test_support',
             'components.gyp:invalidation',
             'components.gyp:invalidation_test_support',
             'components.gyp:json_schema',
             'components.gyp:keyed_service_core',
@@ skipping 111 matching lines @@
                 'components.gyp:web_modal_test_support',
               ],
             }, { # 'OS == "ios"'
               'sources': [
                 'open_from_clipboard/clipboard_recent_content_ios_unittest.mm',
                 'webp_transcode/webp_decoder_unittest.mm',
               ],
               'sources!': [
                 'metrics/gpu/gpu_metrics_provider_unittest.cc',
                 'signin/core/browser/mutable_profile_oauth2_token_service_unittest.cc',
-                # This shouldn't be necessary, but the tests have to be in the main list
-                # due to a test bug making them order-dependent. crbug.com/462352
-                '<@(feedback_unittest_sources)',
               ],
               'sources/': [
                 # Exclude all tests that depends on //content (based on layered-
                 # component directory structure).
                 ['exclude', '^[^/]*/content/'],
               ],
               'dependencies': [
                 '../ios/ios_tests.gyp:test_support_ios',
                 '../ios/web/ios_web.gyp:test_support_ios_web',
                 '../third_party/ocmock/ocmock.gyp:ocmock',
@@ skipping 46 matching lines @@
             }],
             ['OS == "android"', {
               'sources': [
                 'data_reduction_proxy/content/browser/data_reduction_proxy_debug_blocking_page_unittest.cc',
                 'data_reduction_proxy/content/browser/data_reduction_proxy_debug_resource_throttle_unittest.cc',
                 'data_reduction_proxy/content/browser/data_reduction_proxy_debug_ui_manager_unittest.cc',
                 'invalidation/invalidation_logger_unittest.cc',
                 'invalidation/invalidation_service_android_unittest.cc',
               ],
               'sources!': [
-                # This shouldn't be necessary, but the tests have to be in the main list
-                # due to a test bug making them order-dependent. crbug.com/462352
-                '<@(feedback_unittest_sources)',
                 'gcm_driver/gcm_account_mapper_unittest.cc',
                 'gcm_driver/gcm_channel_status_request_unittest.cc',
                 'gcm_driver/gcm_client_impl_unittest.cc',
                 'gcm_driver/gcm_delayed_task_controller_unittest.cc',
                 'gcm_driver/gcm_driver_desktop_unittest.cc',
                 'gcm_driver/gcm_stats_recorder_impl_unittest.cc',
                 'sessions/session_backend_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',
                 'web_modal/web_contents_modal_dialog_manager_unittest.cc',
               ],
               'dependencies': [
                 'components.gyp:data_reduction_proxy_content',
                 '../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:web_modal',
                 'components.gyp:web_modal_test_support',
               ],
             }],
             ['OS != "android"', {
               'sources': [
                 '<@(invalidation_unittest_sources)',
               ],
             }],
             ['OS != "ios" and OS != "android"', {
               'sources': [
                 '<@(audio_modem_unittest_sources)',
                 '<@(copresence_unittest_sources)',
+                '<@(feedback_unittest_sources)',
                 '<@(proximity_auth_unittest_sources)',
               ],
               'dependencies': [
                 '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
                 '../google_apis/google_apis.gyp:google_apis_test_support',
                 '../third_party/protobuf/protobuf.gyp:protobuf_lite',
                 'components.gyp:audio_modem',
                 'components.gyp:audio_modem_test_support',
                 'components.gyp:copresence',
                 'components.gyp:copresence_test_support',
                 'components.gyp:cryptauth',
+                'components.gyp:feedback_component',
                 'components.gyp:proximity_auth',
               ],
             }],
             ['chromeos==1', {
               'sources': [
                 'pairing/message_buffer_unittest.cc',
                 'timers/alarm_timer_unittest.cc',
                 'wifi_sync/wifi_config_delegate_chromeos_unittest.cc',
                 'wifi_sync/wifi_credential_syncable_service_unittest.cc',
                 'wifi_sync/wifi_credential_unittest.cc',
@@ skipping 303 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }