Commit 5d9c705d authored by Carlos Knippschild's avatar Carlos Knippschild Committed by Commit Bot

Revert "Enable Offline Prefetch by default."

This reverts commit 61f145b5.

Reason for revert: Offline Prefetch should not be enabled by default but instead it should be selectively enabled via Finch.

Original change's description:
> Enable Offline Prefetch by default.
> 
> Bug: 687364
> Change-Id: I4727334dcf0060b5a8202a9694e7bd60d31029ec
> Reviewed-on: https://chromium-review.googlesource.com/1105031
> Reviewed-by: Dmitry Titov <dimich@chromium.org>
> Reviewed-by: Filip Gorski <fgorski@chromium.org>
> Commit-Queue: Carlos Knippschild <carlosk@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#568230}

TBR=fgorski@chromium.org,dimich@chromium.org,carlosk@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 687364
Change-Id: I2d70657feba03f695ab461caaa8384703e81c196
Reviewed-on: https://chromium-review.googlesource.com/1122936Reviewed-by: default avatarCarlos Knippschild <carlosk@chromium.org>
Commit-Queue: Carlos Knippschild <carlosk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#571931}
parent 7b99bbe2
...@@ -155,7 +155,7 @@ const char kNotificationsDailyLimit[] = "daily_limit"; ...@@ -155,7 +155,7 @@ const char kNotificationsDailyLimit[] = "daily_limit";
const char kNotificationsIgnoredLimitParam[] = "ignored_limit"; const char kNotificationsIgnoredLimitParam[] = "ignored_limit";
const base::Feature kKeepPrefetchedContentSuggestions{ const base::Feature kKeepPrefetchedContentSuggestions{
"KeepPrefetchedContentSuggestions", base::FEATURE_ENABLED_BY_DEFAULT}; "KeepPrefetchedContentSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kContentSuggestionsDebugLog{ const base::Feature kContentSuggestionsDebugLog{
"ContentSuggestionsDebugLog", base::FEATURE_DISABLED_BY_DEFAULT}; "ContentSuggestionsDebugLog", base::FEATURE_DISABLED_BY_DEFAULT};
......
...@@ -237,7 +237,7 @@ TEST_F(ClientPolicyControllerTest, CheckSuggestedArticlesDefined) { ...@@ -237,7 +237,7 @@ TEST_F(ClientPolicyControllerTest, CheckSuggestedArticlesDefined) {
EXPECT_TRUE(isTemporary(policy)); EXPECT_TRUE(isTemporary(policy));
EXPECT_TRUE(controller()->IsRemovedOnCacheReset(kSuggestedArticlesNamespace)); EXPECT_TRUE(controller()->IsRemovedOnCacheReset(kSuggestedArticlesNamespace));
ExpectRemovedOnCacheReset(kSuggestedArticlesNamespace, true); ExpectRemovedOnCacheReset(kSuggestedArticlesNamespace, true);
ExpectDownloadSupport(kSuggestedArticlesNamespace, true); ExpectDownloadSupport(kSuggestedArticlesNamespace, false);
ExpectUserRequestedDownloadSupport(kSuggestedArticlesNamespace, false); ExpectUserRequestedDownloadSupport(kSuggestedArticlesNamespace, false);
ExpectRecentTab(kSuggestedArticlesNamespace, false); ExpectRecentTab(kSuggestedArticlesNamespace, false);
ExpectOnlyOriginalTab(kSuggestedArticlesNamespace, false); ExpectOnlyOriginalTab(kSuggestedArticlesNamespace, false);
......
...@@ -50,7 +50,7 @@ const base::Feature kBackgroundLoaderForDownloadsFeature{ ...@@ -50,7 +50,7 @@ const base::Feature kBackgroundLoaderForDownloadsFeature{
"BackgroundLoadingForDownloads", base::FEATURE_ENABLED_BY_DEFAULT}; "BackgroundLoadingForDownloads", base::FEATURE_ENABLED_BY_DEFAULT};
const base::Feature kPrefetchingOfflinePagesFeature{ const base::Feature kPrefetchingOfflinePagesFeature{
"OfflinePagesPrefetching", base::FEATURE_ENABLED_BY_DEFAULT}; "OfflinePagesPrefetching", base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kOfflinePagesCTV2Feature{"OfflinePagesCTV2", const base::Feature kOfflinePagesCTV2Feature{"OfflinePagesCTV2",
base::FEATURE_DISABLED_BY_DEFAULT}; base::FEATURE_DISABLED_BY_DEFAULT};
......
...@@ -64,23 +64,23 @@ TEST(OfflinePageFeatureTest, OfflinePagesLoadSignalCollecting) { ...@@ -64,23 +64,23 @@ TEST(OfflinePageFeatureTest, OfflinePagesLoadSignalCollecting) {
TEST(OfflinePageFeatureTest, OfflinePagesPrefetching) { TEST(OfflinePageFeatureTest, OfflinePagesPrefetching) {
// Disabled by default. // Disabled by default.
EXPECT_TRUE(offline_pages::IsPrefetchingOfflinePagesEnabled()); EXPECT_FALSE(offline_pages::IsPrefetchingOfflinePagesEnabled());
// Check if helper method works correctly when the features is enabled. // Check if helper method works correctly when the features is enabled.
base::test::ScopedFeatureList scoped_feature_list; base::test::ScopedFeatureList scoped_feature_list;
scoped_feature_list.InitAndDisableFeature(kPrefetchingOfflinePagesFeature); scoped_feature_list.InitAndEnableFeature(kPrefetchingOfflinePagesFeature);
EXPECT_FALSE(offline_pages::IsPrefetchingOfflinePagesEnabled()); EXPECT_TRUE(offline_pages::IsPrefetchingOfflinePagesEnabled());
} }
TEST(OfflinePageFeatureTest, OfflinePagesPrefetchingUI) { TEST(OfflinePageFeatureTest, OfflinePagesPrefetchingUI) {
// Enabled by default. // Disabled by default.
EXPECT_TRUE(offline_pages::IsOfflinePagesPrefetchingUIEnabled()); EXPECT_FALSE(offline_pages::IsOfflinePagesPrefetchingUIEnabled());
// This feature is enabled by default but depends on the core prefetching // This feature is enabled by default but depends on the core prefetching
// feature. // feature.
base::test::ScopedFeatureList scoped_feature_list; base::test::ScopedFeatureList scoped_feature_list;
scoped_feature_list.InitAndDisableFeature(kPrefetchingOfflinePagesFeature); scoped_feature_list.InitAndEnableFeature(kPrefetchingOfflinePagesFeature);
EXPECT_FALSE(offline_pages::IsOfflinePagesPrefetchingUIEnabled()); EXPECT_TRUE(offline_pages::IsOfflinePagesPrefetchingUIEnabled());
} }
TEST(OfflinePageFeatureTest, OfflinePagesLimitlessPrefetching) { TEST(OfflinePageFeatureTest, OfflinePagesLimitlessPrefetching) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment