Merge pull request #9792 from brave/maxk-cr93fu-disable-kReadLater

[cr93 followup] Disables kReadLater feature.
brave · Aug 24, 2021 · f3e1998 · f3e1998
1 parent 644b8cd
commit f3e1998
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 24 deletions.
diff --git a/app/DEPS b/app/DEPS
@@ -20,6 +20,7 @@ include_rules = [
   "+components/offline_pages/core/offline_page_feature.h",
   "+components/omnibox/common",
   "+components/password_manager/core/common",
+  "+components/reading_list/features/reading_list_switches.h",
   "+components/safe_browsing/core/common/features.h",
   "+components/security_state/core/features.h",
   "+components/signin/public/base",

diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc
@@ -38,6 +38,7 @@
 #include "components/offline_pages/core/offline_page_feature.h"
 #include "components/omnibox/common/omnibox_features.h"
 #include "components/password_manager/core/common/password_manager_features.h"
+#include "components/reading_list/features/reading_list_switches.h"
 #include "components/security_state/core/features.h"
 #include "components/sync/base/sync_base_switches.h"
 #include "components/translate/core/browser/translate_prefs.h"
@@ -233,6 +234,7 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {
     network::features::kTrustTokens.name,
     network_time::kNetworkTimeServiceQuerying.name,
     password_manager::features::kEnablePasswordsAccountStorage.name,
+    reading_list::switches::kReadLater.name,
 #if defined(OS_ANDROID)
     features::kWebNfc.name,
     feed::kInterestFeedContentSuggestions.name,

diff --git a/app/brave_main_delegate_browsertest.cc b/app/brave_main_delegate_browsertest.cc
@@ -15,6 +15,7 @@
 #include "components/network_time/network_time_tracker.h"
 #include "components/omnibox/common/omnibox_features.h"
 #include "components/password_manager/core/common/password_manager_features.h"
+#include "components/reading_list/features/reading_list_switches.h"
 #include "components/security_state/core/features.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/common/content_features.h"
@@ -69,30 +70,31 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, OriginTrialsTest) {
 
 IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
   const base::Feature* disabled_features[] = {
-    &autofill::features::kAutofillEnableAccountWalletStorage,
-    &autofill::features::kAutofillServerCommunication,
-    &blink::features::kFledgeInterestGroupAPI,
-    &blink::features::kFledgeInterestGroups,
-    &blink::features::kHandwritingRecognitionWebPlatformApiFinch,
-    &blink::features::kInterestCohortAPIOriginTrial,
-    &blink::features::kInterestCohortFeaturePolicy,
-    &blink::features::kTextFragmentAnchor,
-    &features::kDirectSockets,
-    &features::kIdleDetection,
-    &features::kLangClientHintHeader,
-    &features::kNotificationTriggers,
-    &features::kPrivacySandboxSettings,
-    &features::kSignedExchangePrefetchCacheForNavigations,
-    &features::kSignedExchangeSubresourcePrefetch,
-    &features::kSubresourceWebBundles,
-    &features::kWebOTP,
-    &federated_learning::kFederatedLearningOfCohorts,
-    &federated_learning::kFlocIdComputedEventLogging,
-    &media::kLiveCaption,
-    &net::features::kFirstPartySets,
-    &network::features::kTrustTokens,
-    &network_time::kNetworkTimeServiceQuerying,
-    &password_manager::features::kEnablePasswordsAccountStorage,
+      &autofill::features::kAutofillEnableAccountWalletStorage,
+      &autofill::features::kAutofillServerCommunication,
+      &blink::features::kFledgeInterestGroupAPI,
+      &blink::features::kFledgeInterestGroups,
+      &blink::features::kHandwritingRecognitionWebPlatformApiFinch,
+      &blink::features::kInterestCohortAPIOriginTrial,
+      &blink::features::kInterestCohortFeaturePolicy,
+      &blink::features::kTextFragmentAnchor,
+      &features::kDirectSockets,
+      &features::kIdleDetection,
+      &features::kLangClientHintHeader,
+      &features::kNotificationTriggers,
+      &features::kPrivacySandboxSettings,
+      &features::kSignedExchangePrefetchCacheForNavigations,
+      &features::kSignedExchangeSubresourcePrefetch,
+      &features::kSubresourceWebBundles,
+      &features::kWebOTP,
+      &federated_learning::kFederatedLearningOfCohorts,
+      &federated_learning::kFlocIdComputedEventLogging,
+      &media::kLiveCaption,
+      &net::features::kFirstPartySets,
+      &network::features::kTrustTokens,
+      &network_time::kNetworkTimeServiceQuerying,
+      &password_manager::features::kEnablePasswordsAccountStorage,
+      &reading_list::switches::kReadLater,
   };
 
   for (const auto* feature : disabled_features)

diff --git a/test/BUILD.gn b/test/BUILD.gn
@@ -721,6 +721,7 @@ if (!is_android) {
       "//brave/vendor/bat-native-ads",
       "//brave/vendor/bat-native-ledger",
       "//brave/vendor/bat-native-ledger:publishers_proto",
+      "//components/reading_list/features:flags",
       "//components/security_interstitials/content:security_interstitial_page",
       "//media:test_support",
       "//testing/gmock",
@@ -982,6 +983,7 @@ if (!is_android) {
       "//components/federated_learning",
       "//components/language/core/common",
       "//components/network_time",
+      "//components/reading_list/features:flags",
       "//components/spellcheck/browser",
       "//services/device/public/cpp:device_features",