Revert of Remove dependency on //components/feedback on iOS

components/components_tests.gyp

Index: components/components_tests.gyp
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index ca9b112089bd9bd475a2b23aad6a0a6a5654ee39..a692b0545d4fe823ea6050163f1829d334e6bffa 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -164,6 +164,10 @@
             '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',
@@ -397,6 +401,7 @@
             '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',
@@ -634,6 +639,10 @@
                 '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',
@@ -651,6 +660,7 @@
                 '../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',
@@ -688,10 +698,6 @@
                 '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',
@@ -713,7 +719,6 @@
                 'components.gyp:copresence',
                 'components.gyp:copresence_test_support',
                 'components.gyp:cryptauth',
-                'components.gyp:feedback_component',
                 'components.gyp:proximity_auth',
               ],
             }],