Fix problem with WebRTC roll

See the bug. WebRTC imports only some
directories from chromium. This CL removes a
dependency on components/feed from build/

Bug: 1129187
Change-Id: Ia6c0188d51f955318fac2cbc6479176bbbdcebf3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2461979
Commit-Queue: Dan H <harringtond@chromium.org>
Reviewed-by: Mirko Bonadei <mbonadei@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#815267}

chrome/common/features.gni

@@ -7,6 +7,7 @@ import("//build/config/chromecast_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/dcheck_always_on.gni")
 import("//build/config/features.gni")
+import("//components/feed/features.gni")
 import("//components/safe_browsing/buildflags.gni")
 import("//device/vr/buildflags/buildflags.gni")
 import("//extensions/buildflags/buildflags.gni")
@@ -86,4 +87,6 @@ chrome_grit_defines = [
   "enable_webui_tab_strip=$enable_webui_tab_strip",
   "safe_browsing_mode=$safe_browsing_mode",
   "optimize_webui=$optimize_webui",
+  "enable_feed_v1=$enable_feed_v1",
+  "enable_feed_v2=$enable_feed_v2",
 ]

components/strings/BUILD.gn

@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/locales.gni")
+import("//components/feed/features.gni")
 import("//ppapi/buildflags/buildflags.gni")
 import("//printing/buildflags/buildflags.gni")
 import("//tools/grit/grit_rule.gni")
@@ -30,6 +31,7 @@ grit("components_strings") {
   defines = [
     "enable_plugins=$enable_plugins",
     "enable_print_preview=$enable_print_preview",
+    "enable_feed_v1=$enable_feed_v1",
   ]
 
   outputs = [ "grit/components_strings.h" ]

tools/grit/grit_defines.gni

@@ -6,7 +6,6 @@ import("//build/config/chrome_build.gni")
 import("//build/config/chromeos/ui_mode.gni")
 import("//build/config/crypto.gni")
 import("//build/config/ui.gni")
-import("//components/feed/features.gni")
 
 grit_defines = []
 
@@ -98,13 +97,6 @@ if (is_android) {
   ]
 }
 
-if (enable_feed_v1) {
-  grit_defines += [
-    "-D",
-    "enable_feed_v1",
-  ]
-}
-
 # When cross-compiling, explicitly pass the target system to grit.
 if (current_toolchain != host_toolchain) {
   if (is_android) {