Revert of Remove dependency on //components/feedback on iOS (patchset #1 id:1 of https://codereview.chromium.org/954943004/)

Reason for revert:
This CL cause the test to run in another order, causing a hidden dependency on the ordering to be visible. Reverting as this cause test failures.

See http://crbug.com/462352

Original issue's description:
> Remove dependency on //components/feedback on iOS
>
> iOS does not use //components/feedback to report feedback so remove
> the unused dependencies.
>
> BUG=None
>
> Committed: https://crrev.com/3e96329f442c10d73174688a4786ab847a49a37f
> Cr-Commit-Position: refs/heads/master@{#318211}

TBR=thakis@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=None

Review URL: https://codereview.chromium.org/968653004

Cr-Commit-Position: refs/heads/master@{#318674}

7 files changed, 25 insertions, 11 deletions

diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 975c68c..ce8af0f 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -93,6 +93,7 @@ static_library("browser") {
     "//components/enhanced_bookmarks",
     "//components/favicon_base",
     "//components/favicon/core",
+    "//components/feedback",
     "//components/gcm_driver",
     "//components/google/core/browser",
     "//components/handoff",
@@ -582,7 +583,6 @@ static_library("browser") {
                            ".",
                            "//chrome")
     deps += [
-      "//components/feedback",
       "//device/core",
       "//device/usb",
     ]
@@ -603,6 +603,7 @@ static_library("browser") {
     ]
     deps -= [
       "//third_party/libaddressinput",
+      "//components/feedback",
       "//components/storage_monitor",
       "//components/web_modal",
     ]
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 237b239..0030248 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -47,6 +47,7 @@ static_library("ui") {
     "//components/app_modal",
     "//components/auto_login_parser",
     "//components/dom_distiller/webui",
+    "//components/feedback/proto",
     "//components/history/core/browser:proto",
     "//components/invalidation",
     "//components/onc",
@@ -134,7 +135,6 @@ static_library("ui") {
                     "//chrome")
     deps += [
       "//components/copresence",
-      "//components/feedback/proto",
       "//device/bluetooth",
       "//third_party/libusb",
     ]
@@ -313,6 +313,7 @@ static_library("ui") {
     ]
     deps -= [
       "//chrome/browser/ui/views",
+      "//components/feedback/proto",
       "//ui/events",
     ]
     sources += rebase_path(gypi_values.chrome_browser_ui_android_sources,
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 501a602..e298830 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2896,6 +2896,7 @@
         '../components/components.gyp:enhanced_bookmarks',
         '../components/components.gyp:favicon_base',
         '../components/components.gyp:favicon_core',
+        '../components/components.gyp:feedback_component',
         '../components/components.gyp:gcm_driver',
         '../components/components.gyp:google_core_browser',
         '../components/components.gyp:handoff',
@@ -3366,7 +3367,6 @@
         }, {  # OS!="android" and OS!="ios"
           'sources': [ '<@(chrome_browser_non_mobile_sources)' ],
           'dependencies': [
-            '../components/components.gyp:feedback_component',
             '../device/core/core.gyp:device_core',
             '../device/usb/usb.gyp:device_usb',
           ]
@@ -3383,6 +3383,7 @@
             'chrome_browser_jni_headers',
           ],
           'dependencies!': [
+            '../components/components.gyp:feedback_component',
             '../components/components.gyp:storage_monitor',
             '../components/components.gyp:web_modal',
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 28e210e..5cb184b 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -2668,6 +2668,7 @@
         '../components/components.gyp:device_event_log_component',
         '../components/components.gyp:dom_distiller_core',
         '../components/components.gyp:dom_distiller_webui',
+        '../components/components.gyp:feedback_proto',
         '../components/components.gyp:history_core_browser_proto',
         '../components/components.gyp:invalidation',
         '../components/components.gyp:onc_component',
@@ -2928,6 +2929,7 @@
             'chrome_browser_jni_headers',
           ],
           'dependencies!': [
+             '../components/components.gyp:feedback_proto',
              '../ui/events/events.gyp:events',
              'chrome_browser_ui_views.gyp:browser_ui_views',
           ],
@@ -3124,7 +3126,6 @@
         }],
         ['OS!="android" and OS!="ios"', {
           'dependencies': [
-            '../components/components.gyp:feedback_proto',
             '../device/bluetooth/bluetooth.gyp:device_bluetooth',
             '../third_party/libusb/libusb.gyp:libusb',
           ],
diff --git a/components/BUILD.gn b/components/BUILD.gn
index 95b02c9..d7cd5cf 100644
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -40,6 +40,7 @@ group("all_components") {
     "//components/enhanced_bookmarks",
     "//components/favicon/core",
     "//components/favicon_base",
+    "//components/feedback",
     "//components/gcm_driver",
     "//components/google/core/browser",
     "//components/history/content/browser",
@@ -161,6 +162,7 @@ group("all_components") {
       "//components/domain_reliability",  # Blocked on content.
       "//components/favicon_base",  # Should work, needs checking.
       "//components/favicon/core",  # Blocked on keyed service.
+      "//components/feedback",  # Blocked on content.
       "//components/gcm_driver",  # Should work, needs checking.
       "//components/google/core/browser",  # Should work, needs checking.
       "//components/history/core/browser",  # Should work, needs checking.
@@ -202,7 +204,6 @@ group("all_components") {
   if (!is_ios && !is_android) {
     deps += [
       "//components/copresence",
-      "//components/feedback",
       "//components/storage_monitor",
     ]
   }
diff --git a/components/components.gyp b/components/components.gyp
index 17e4235..db6d9b0 100644
--- a/components/components.gyp
+++ b/components/components.gyp
@@ -88,11 +88,15 @@
         'webp_transcode.gypi',
       ],
     }],
+    ['OS != "android"', {
+      'includes': [
+        'feedback.gypi',
+      ]
+    }],
     ['OS != "ios" and OS != "android"', {
       'includes': [
         'audio_modem.gypi',
         'copresence.gypi',
-        'feedback.gypi',
         'proximity_auth.gypi',
         'storage_monitor.gypi',
       ]
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 4f44e2b..3ab640f 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -165,6 +165,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',
               ],
             }],