Commit 2a7a2c2f authored by Pete Williamson's avatar Pete Williamson Committed by Commit Bot

Enable P2P sharing by default

We have permission to take P2P Offline sharing to 100%.  In conjunction
with the finch change, we turn on the feature by default, so we can set
and end date on the finch experiment.

Bug: 758690
Change-Id: Icd0e886ea4a8a64456abb7a5a40ce9dac11a9143
Reviewed-on: https://chromium-review.googlesource.com/1110601Reviewed-by: default avatarRobert Kaplow <rkaplow@chromium.org>
Reviewed-by: default avatarJian Li <jianli@chromium.org>
Commit-Queue: Peter Williamson <petewil@chromium.org>
Cr-Commit-Position: refs/heads/master@{#569650}
parent 19e8f142
...@@ -47,7 +47,7 @@ TEST(OfflineItemConversionsTest, OfflinePageItemConversion) { ...@@ -47,7 +47,7 @@ TEST(OfflineItemConversionsTest, OfflinePageItemConversion) {
EXPECT_EQ(creation_time, offline_item.creation_time); EXPECT_EQ(creation_time, offline_item.creation_time);
EXPECT_EQ(last_access_time, offline_item.last_accessed_time); EXPECT_EQ(last_access_time, offline_item.last_accessed_time);
EXPECT_EQ(file_size, offline_item.total_size_bytes); EXPECT_EQ(file_size, offline_item.total_size_bytes);
EXPECT_EQ("text/html", offline_item.mime_type); EXPECT_EQ("multipart/related", offline_item.mime_type);
EXPECT_EQ(OfflineItemFilter::FILTER_PAGE, offline_item.filter); EXPECT_EQ(OfflineItemFilter::FILTER_PAGE, offline_item.filter);
EXPECT_EQ(OfflineItemState::COMPLETE, offline_item.state); EXPECT_EQ(OfflineItemState::COMPLETE, offline_item.state);
EXPECT_EQ(100, offline_item.progress.value); EXPECT_EQ(100, offline_item.progress.value);
...@@ -62,14 +62,14 @@ TEST(OfflineItemConversionsTest, OfflinePageItemConversion) { ...@@ -62,14 +62,14 @@ TEST(OfflineItemConversionsTest, OfflinePageItemConversion) {
// OfflineItem. Then check that only the mime type is and is_suggested // OfflineItem. Then check that only the mime type is and is_suggested
// information changed. // information changed.
base::test::ScopedFeatureList scoped_feature_list; base::test::ScopedFeatureList scoped_feature_list;
scoped_feature_list.InitAndEnableFeature(kOfflinePagesSharingFeature); scoped_feature_list.InitAndDisableFeature(kOfflinePagesSharingFeature);
OfflineItem offline_item_p2p = OfflineItem offline_item_p2p =
OfflineItemConversions::CreateOfflineItem(offline_page_item, false); OfflineItemConversions::CreateOfflineItem(offline_page_item, false);
EXPECT_EQ("multipart/related", offline_item_p2p.mime_type); EXPECT_EQ("text/html", offline_item_p2p.mime_type);
EXPECT_FALSE(offline_item_p2p.is_suggested); EXPECT_FALSE(offline_item_p2p.is_suggested);
// Change offline_item_p2p to match offline_item and check that it does. // Change offline_item_p2p to match offline_item and check that it does.
offline_item_p2p.mime_type = "text/html"; offline_item_p2p.mime_type = "multipart/related";
offline_item_p2p.is_suggested = true; offline_item_p2p.is_suggested = true;
EXPECT_EQ(offline_item, offline_item_p2p); EXPECT_EQ(offline_item, offline_item_p2p);
} }
...@@ -95,7 +95,7 @@ TEST(OfflineItemConversionsTest, SavePageRequestConversion) { ...@@ -95,7 +95,7 @@ TEST(OfflineItemConversionsTest, SavePageRequestConversion) {
EXPECT_EQ(base::FilePath(), offline_item.file_path); EXPECT_EQ(base::FilePath(), offline_item.file_path);
EXPECT_EQ(creation_time, offline_item.creation_time); EXPECT_EQ(creation_time, offline_item.creation_time);
EXPECT_EQ(base::Time(), offline_item.last_accessed_time); EXPECT_EQ(base::Time(), offline_item.last_accessed_time);
EXPECT_EQ("text/html", offline_item.mime_type); EXPECT_EQ("multipart/related", offline_item.mime_type);
EXPECT_EQ(OfflineItemFilter::FILTER_PAGE, offline_item.filter); EXPECT_EQ(OfflineItemFilter::FILTER_PAGE, offline_item.filter);
EXPECT_EQ(OfflineItemState::IN_PROGRESS, offline_item.state); EXPECT_EQ(OfflineItemState::IN_PROGRESS, offline_item.state);
EXPECT_EQ(0, offline_item.progress.value); EXPECT_EQ(0, offline_item.progress.value);
...@@ -103,16 +103,16 @@ TEST(OfflineItemConversionsTest, SavePageRequestConversion) { ...@@ -103,16 +103,16 @@ TEST(OfflineItemConversionsTest, SavePageRequestConversion) {
EXPECT_EQ(OfflineItemProgressUnit::PERCENTAGE, offline_item.progress.unit); EXPECT_EQ(OfflineItemProgressUnit::PERCENTAGE, offline_item.progress.unit);
EXPECT_FALSE(offline_item.is_suggested); EXPECT_FALSE(offline_item.is_suggested);
// Enabled P2P sharing of offline pages and check that only the mime type is // Disable P2P sharing of offline pages and check that only the mime type is
// different. // different.
base::test::ScopedFeatureList scoped_feature_list; base::test::ScopedFeatureList scoped_feature_list;
scoped_feature_list.InitAndEnableFeature(kOfflinePagesSharingFeature); scoped_feature_list.InitAndDisableFeature(kOfflinePagesSharingFeature);
OfflineItem offline_item_p2p = OfflineItem offline_item_p2p =
OfflineItemConversions::CreateOfflineItem(save_page_request); OfflineItemConversions::CreateOfflineItem(save_page_request);
EXPECT_EQ("multipart/related", offline_item_p2p.mime_type); EXPECT_EQ("text/html", offline_item_p2p.mime_type);
// Change offline_item_p2p to match offline_item and check that it does. // Change offline_item_p2p to match offline_item and check that it does.
offline_item_p2p.mime_type = "text/html"; offline_item_p2p.mime_type = "multipart/related";
EXPECT_EQ(offline_item, offline_item_p2p); EXPECT_EQ(offline_item, offline_item_p2p);
} }
......
...@@ -32,7 +32,7 @@ const base::Feature kOfflinePagesCTFeature{"OfflinePagesCT", ...@@ -32,7 +32,7 @@ const base::Feature kOfflinePagesCTFeature{"OfflinePagesCT",
base::FEATURE_ENABLED_BY_DEFAULT}; base::FEATURE_ENABLED_BY_DEFAULT};
const base::Feature kOfflinePagesSharingFeature{ const base::Feature kOfflinePagesSharingFeature{
"OfflinePagesSharing", base::FEATURE_DISABLED_BY_DEFAULT}; "OfflinePagesSharing", base::FEATURE_ENABLED_BY_DEFAULT};
const base::Feature kOfflinePagesSvelteConcurrentLoadingFeature{ const base::Feature kOfflinePagesSvelteConcurrentLoadingFeature{
"OfflinePagesSvelteConcurrentLoading", base::FEATURE_DISABLED_BY_DEFAULT}; "OfflinePagesSvelteConcurrentLoading", base::FEATURE_DISABLED_BY_DEFAULT};
......
...@@ -31,8 +31,8 @@ TEST(OfflinePageFeatureTest, OffliningRecentPages) { ...@@ -31,8 +31,8 @@ TEST(OfflinePageFeatureTest, OffliningRecentPages) {
} }
TEST(OfflinePageFeatureTest, OfflinePagesSharing) { TEST(OfflinePageFeatureTest, OfflinePagesSharing) {
// Disabled by default. // Enabled by default.
EXPECT_FALSE(offline_pages::IsOfflinePagesSharingEnabled()); EXPECT_TRUE(offline_pages::IsOfflinePagesSharingEnabled());
// Check if helper method works correctly when the features is disabled. // Check if helper method works correctly when the features is disabled.
base::test::ScopedFeatureList scoped_feature_list; base::test::ScopedFeatureList scoped_feature_list;
......
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