Revert of 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 146 matching lines @@
             'domain_reliability/test_util.h',
             'domain_reliability/uploader_unittest.cc',
             'domain_reliability/util_unittest.cc',
             'favicon_base/select_favicon_frames_unittest.cc',
             # Note: GN tests converted to here, need to do the rest.
 
             'enhanced_bookmarks/enhanced_bookmark_model_unittest.cc',
             'enhanced_bookmarks/image_store_ios_unittest.mm',
             'enhanced_bookmarks/image_store_unittest.cc',
             'enhanced_bookmarks/item_position_unittest.cc',
+            'feedback/feedback_common_unittest.cc',
+            'feedback/feedback_data_unittest.cc',
+            'feedback/feedback_uploader_chrome_unittest.cc',
+            'feedback/feedback_uploader_unittest.cc',
             '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',
             'google/core/browser/google_url_tracker_unittest.cc',
             'google/core/browser/google_util_unittest.cc',
             'history/core/browser/android/android_history_types_unittest.cc',
             'history/core/browser/history_types_unittest.cc',
@@ skipping 213 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 217 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_service_android_unittest.cc',
               ],
               'sources!': [
+                'feedback/feedback_common_unittest.cc',
+                'feedback/feedback_data_unittest.cc',
+                'feedback/feedback_uploader_chrome_unittest.cc',
+                'feedback/feedback_uploader_unittest.cc',
                 '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',
                 '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/fake_invalidator_unittest.cc',
                 'invalidation/gcm_network_channel_unittest.cc',
@@ skipping 17 matching lines @@
                 'audio_modem/audio_recorder_unittest.cc',
                 'audio_modem/modem_unittest.cc',
                 'copresence/copresence_state_unittest.cc',
                 'copresence/handlers/audio/audio_directive_handler_unittest.cc',
                 'copresence/handlers/audio/audio_directive_list_unittest.cc',
                 'copresence/handlers/directive_handler_unittest.cc',
                 'copresence/handlers/gcm_handler_unittest.cc',
                 'copresence/rpc/http_post_unittest.cc',
                 'copresence/rpc/rpc_handler_unittest.cc',
                 'copresence/timed_map_unittest.cc',
-                'feedback/feedback_common_unittest.cc',
-                'feedback/feedback_data_unittest.cc',
-                'feedback/feedback_uploader_chrome_unittest.cc',
-                'feedback/feedback_uploader_unittest.cc',
                 'proximity_auth/base64url_unittest.cc',
                 'proximity_auth/bluetooth_connection_finder_unittest.cc',
                 'proximity_auth/bluetooth_connection_unittest.cc',
                 'proximity_auth/client_unittest.cc',
                 'proximity_auth/connection_unittest.cc',
                 'proximity_auth/cryptauth/cryptauth_account_token_fetcher_unittest.cc',
                 'proximity_auth/cryptauth/cryptauth_api_call_flow_unittest.cc',
                 'proximity_auth/cryptauth/cryptauth_client_unittest.cc',
                 'proximity_auth/proximity_auth_system_unittest.cc',
                 'proximity_auth/remote_status_update_unittest.cc',
                 'proximity_auth/wire_message_unittest.cc',
               ],
               '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 337 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'components_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }