Remove Prefetching UI feature flag

With Offline Page being fully deployed there is no need anymore for the
UI-exclusive flag that was introduced in its very beginnings, as a means
to have its pipeline tested without any visual clues of its existence.

This change removes that flag that and consolidates all UI related
checks on the main feature flag that still remains in place.

Bug: 850588
Change-Id: If30bbf36b8361a5af69bf59a748600d5fd1e71ea
Reviewed-on: https://chromium-review.googlesource.com/1157526Reviewed-by: Carlos Knippschild <carlosk@chromium.org>
Reviewed-by: Justin DeWitt <dewittj@chromium.org>
Commit-Queue: Carlos Knippschild <carlosk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#580019}

chrome/browser/about_flags.cc

@@ -2370,10 +2370,6 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kOfflinePagesPrefetchingName,
      flag_descriptions::kOfflinePagesPrefetchingDescription, kOsAndroid,
      FEATURE_VALUE_TYPE(offline_pages::kPrefetchingOfflinePagesFeature)},
-    {"offline-pages-prefetching-ui",
-     flag_descriptions::kOfflinePagesPrefetchingUIName,
-     flag_descriptions::kOfflinePagesPrefetchingUIDescription, kOsAndroid,
-     FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesPrefetchingUIFeature)},
     {"offline-pages-limitless-prefetching",
      flag_descriptions::kOfflinePagesLimitlessPrefetchingName,
      flag_descriptions::kOfflinePagesLimitlessPrefetchingDescription,

chrome/browser/flag_descriptions.cc

@@ -2553,12 +2553,6 @@ const char kOfflinePagesPrefetchingDescription[] =
     "Enables suggested offline pages to be prefetched, so useful content is "
     "available while offline.";
 
-const char kOfflinePagesPrefetchingUIName[] =
-    "Enables prefetched offline pages to be shown in UI.";
-const char kOfflinePagesPrefetchingUIDescription[] =
-    "Enables prefetched offline pages to raise notifications and be shown in "
-    "download home UI.";
-
 const char kOfflinePagesResourceBasedSnapshotName[] =
     "Enables offline page snapshots to be based on percentage of page loaded.";
 const char kOfflinePagesResourceBasedSnapshotDescription[] =

chrome/browser/flag_descriptions.h

@@ -1544,9 +1544,6 @@ extern const char kOfflinePagesLoadSignalCollectingDescription[];
 extern const char kOfflinePagesPrefetchingName[];
 extern const char kOfflinePagesPrefetchingDescription[];
 
-extern const char kOfflinePagesPrefetchingUIName[];
-extern const char kOfflinePagesPrefetchingUIDescription[];
-
 extern const char kOfflinePagesResourceBasedSnapshotName[];
 extern const char kOfflinePagesResourceBasedSnapshotDescription[];
 

chrome/browser/offline_pages/fresh_offline_content_observer.cc

@@ -18,7 +18,7 @@ int kFreshOfflineContentObserverUserDataKey;
 // static
 void FreshOfflineContentObserver::AttachToOfflinePageModel(
     OfflinePageModel* model) {
-  if (!IsOfflinePagesPrefetchingUIEnabled())
+  if (!IsPrefetchingOfflinePagesEnabled())
     return;
   auto observer = std::make_unique<FreshOfflineContentObserver>();
   model->AddObserver(observer.get());

components/offline_pages/core/client_policy_controller.cc

@@ -69,7 +69,7 @@ ClientPolicyController::ClientPolicyController() {
           .SetIsRemovedOnCacheReset(true)
           .SetIsDisabledWhenPrefetchDisabled(true)
           .SetExpirePeriod(base::TimeDelta::FromDays(30))
-          .SetIsSupportedByDownload(IsOfflinePagesPrefetchingUIEnabled())
+          .SetIsSupportedByDownload(IsPrefetchingOfflinePagesEnabled())
           .SetIsSuggested(true)
           .Build()));
   policies_.insert(std::make_pair(

components/offline_pages/core/offline_page_feature.cc

@@ -55,9 +55,6 @@ const base::Feature kPrefetchingOfflinePagesFeature{
 const base::Feature kOfflinePagesCTV2Feature{"OfflinePagesCTV2",
                                              base::FEATURE_DISABLED_BY_DEFAULT};
 
-const base::Feature kOfflinePagesPrefetchingUIFeature{
-    "OfflinePagesPrefetchingUI", base::FEATURE_ENABLED_BY_DEFAULT};
-
 const base::Feature kOfflinePagesLimitlessPrefetchingFeature{
     "OfflinePagesLimitlessPrefetching", base::FEATURE_DISABLED_BY_DEFAULT};
 
@@ -110,11 +107,6 @@ bool IsPrefetchingOfflinePagesEnabled() {
   return base::FeatureList::IsEnabled(kPrefetchingOfflinePagesFeature);
 }
 
-bool IsOfflinePagesPrefetchingUIEnabled() {
-  return IsPrefetchingOfflinePagesEnabled() &&
-         base::FeatureList::IsEnabled(kOfflinePagesPrefetchingUIFeature);
-}
-
 bool IsLimitlessPrefetchingEnabled() {
   // TODO(https://crbug.com/803584): fix limitless mode or fully remove it.
   return limitless_prefetching_enabled;

components/offline_pages/core/offline_page_feature.h

@@ -21,7 +21,6 @@ extern const base::Feature kOfflinePagesLoadSignalCollectingFeature;
 extern const base::Feature kOfflinePagesCTV2Feature;
 extern const base::Feature kOfflinePagesRenovationsFeature;
 extern const base::Feature kOfflinePagesResourceBasedSnapshotFeature;
-extern const base::Feature kOfflinePagesPrefetchingUIFeature;
 extern const base::Feature kOfflinePagesLimitlessPrefetchingFeature;
 extern const base::Feature kOfflinePagesDescriptivePendingStatusFeature;
 extern const base::Feature kOfflinePagesInDownloadHomeOpenInCctFeature;
@@ -56,9 +55,6 @@ bool IsOfflinePagesSvelteConcurrentLoadingEnabled();
 // Returns true if prefetching offline pages is enabled.
 bool IsPrefetchingOfflinePagesEnabled();
 
-// Returns true if we should show UI for prefetched pages.
-bool IsOfflinePagesPrefetchingUIEnabled();
-
 // Returns true if prefetching offline pages should ignore its normal resource
 // usage limits.
 bool IsLimitlessPrefetchingEnabled();

components/offline_pages/core/offline_page_feature_unittest.cc

@@ -72,17 +72,6 @@ TEST(OfflinePageFeatureTest, OfflinePagesPrefetching) {
   EXPECT_TRUE(offline_pages::IsPrefetchingOfflinePagesEnabled());
 }
 
-TEST(OfflinePageFeatureTest, OfflinePagesPrefetchingUI) {
-  // Disabled by default.
-  EXPECT_FALSE(offline_pages::IsOfflinePagesPrefetchingUIEnabled());
-
-  // This feature is enabled by default but depends on the core prefetching
-  // feature.
-  base::test::ScopedFeatureList scoped_feature_list;
-  scoped_feature_list.InitAndEnableFeature(kPrefetchingOfflinePagesFeature);
-  EXPECT_TRUE(offline_pages::IsOfflinePagesPrefetchingUIEnabled());
-}
-
 TEST(OfflinePageFeatureTest, OfflinePagesLimitlessPrefetching) {
   // Disabled by default.
   EXPECT_FALSE(offline_pages::IsLimitlessPrefetchingEnabled());