From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Thu, 19 Dec 2019 22:52:53 +0100
Subject: Disable feeds support by default

License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
 .../org/chromium/chrome/browser/feed/FeedFeatures.java    | 8 +-------
 .../chromium/chrome/browser/flags/CachedFeatureFlags.java | 2 +-
 components/feed/feed_feature_list.cc                      | 8 ++++----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java
--- a/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java
+++ b/chrome/browser/feed/android/java/src/org/chromium/chrome/browser/feed/FeedFeatures.java
@@ -50,13 +50,7 @@ public final class FeedFeatures {
      *         the user is signed in and confirms it's not a child profile.
      */
     public static boolean isWebFeedUIEnabled() {
-        // TODO(b/197354832, b/188188861): change consent check to SIGNIN.
-        return ChromeFeatureList.isEnabled(ChromeFeatureList.WEB_FEED)
-                && IdentityServicesProvider.get()
-                           .getSigninManager(Profile.getLastUsedRegularProfile())
-                           .getIdentityManager()
-                           .hasPrimaryAccount(ConsentLevel.SYNC)
-                && !Profile.getLastUsedRegularProfile().isChild();
+        return false;
     }
 
     public static boolean shouldUseWebFeedAwarenessIPH() {
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/CachedFeatureFlags.java
@@ -78,7 +78,7 @@ public class CachedFeatureFlags {
                     .put(ChromeFeatureList.INCOGNITO_REAUTHENTICATION_FOR_ANDROID, false)
                     .put(ChromeFeatureList.INSTANCE_SWITCHER, true)
                     .put(ChromeFeatureList.INSTANT_START, false)
-                    .put(ChromeFeatureList.INTEREST_FEED_V2, true)
+                    .put(ChromeFeatureList.INTEREST_FEED_V2, false)
                     .put(ChromeFeatureList.LENS_CAMERA_ASSISTED_SEARCH, false)
                     .put(ChromeFeatureList.NEW_WINDOW_APP_MENU, true)
                     .put(ChromeFeatureList.OMAHA_MIN_SDK_VERSION_ANDROID, false)
diff --git a/components/feed/feed_feature_list.cc b/components/feed/feed_feature_list.cc
--- a/components/feed/feed_feature_list.cc
+++ b/components/feed/feed_feature_list.cc
@@ -17,14 +17,14 @@
 namespace feed {
 
 BASE_FEATURE(kInterestFeedContentSuggestions,
-             "InterestFeedContentSuggestions",
-             base::FEATURE_ENABLED_BY_DEFAULT);
+             "InterestFeedContentSuggestions",          // must be disabled
+             base::FEATURE_DISABLED_BY_DEFAULT);        // by default in Bromite
 // InterestFeedV2 takes precedence over InterestFeedContentSuggestions.
 // InterestFeedV2 is cached in ChromeCachedFlags. If the default value here is
 // changed, please update the cached one's default value in CachedFeatureFlags.
 BASE_FEATURE(kInterestFeedV2,
-             "InterestFeedV2",
-             base::FEATURE_ENABLED_BY_DEFAULT);
+             "InterestFeedV2",                          // must be disabled
+             base::FEATURE_DISABLED_BY_DEFAULT);        // by default in Bromite
 
 BASE_FEATURE(kInterestFeedV2Autoplay,
              "InterestFeedV2Autoplay",
--
2.25.1
