Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(461)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/data_reduction_proxy/content/browser/content_lofi_decider_unittest.cc

Issue 2903453003: DataReductionProxy proto change to use exp=force_lite_page directive (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« components/data_reduction_proxy/content/browser/content_lofi_decider.cc ('K') | « components/data_reduction_proxy/content/browser/content_lofi_decider.cc ('k') | components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate.cc » ('j') | components/data_reduction_proxy/core/common/data_reduction_proxy_headers.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/data_reduction_proxy/content/browser/content_lofi_decider_unittest.cc
diff --git a/components/data_reduction_proxy/content/browser/content_lofi_decider_unittest.cc b/components/data_reduction_proxy/content/browser/content_lofi_decider_unittest.cc
index 9405f8dcebf222f527961ac179e1b9a2a6afe548..c06eb4b50155709575c2a80cbd15f034e6c6f06c 100644
--- a/components/data_reduction_proxy/content/browser/content_lofi_decider_unittest.cc
+++ b/components/data_reduction_proxy/content/browser/content_lofi_decider_unittest.cc
@@ -203,15 +203,14 @@ class ContentLoFiDeciderTest : public testing::Test {
header_value.find(compressed_video_directive()) != std::string::npos);
}
- static void VerifyLitePageIgnoreBlacklistHeader(
- bool expected_blacklist_directive_added,
+ static void VerifyForceLitePageHeader(
+ bool expected_force_directive_added,
const net::HttpRequestHeaders& headers) {
EXPECT_TRUE(headers.HasHeader(chrome_proxy_header()));
std::string header_value;
headers.GetHeader(chrome_proxy_header(), &header_value);
- EXPECT_EQ(expected_blacklist_directive_added,
- header_value.find(
- chrome_proxy_lite_page_ignore_blacklist_directive()) !=
+ EXPECT_EQ(expected_force_directive_added,
+ header_value.find(chrome_proxy_force_lite_page_directive()) !=
std::string::npos);
}
@@ -258,7 +257,7 @@ TEST_F(ContentLoFiDeciderTest, LoFiFlags) {
NotifyBeforeSendHeaders(&headers, request.get(), true);
VerifyLoFiHeader(false, false, headers);
VerifyLitePageHeader(false, false, headers);
- VerifyLitePageIgnoreBlacklistHeader(false, headers);
+ VerifyForceLitePageHeader(false, headers);
// The Lo-Fi flag is "always-on", Lo-Fi is being used, and it's a main frame
// request. Lo-Fi or lite page header should be added.
@@ -273,7 +272,7 @@ TEST_F(ContentLoFiDeciderTest, LoFiFlags) {
headers);
VerifyLitePageHeader(tests[i].is_using_lite_page && tests[i].is_main_frame,
false, headers);
- VerifyLitePageIgnoreBlacklistHeader(
+ VerifyForceLitePageHeader(
tests[i].is_using_lite_page && tests[i].is_main_frame, headers);
DataReductionProxyData* data = DataReductionProxyData::GetData(*request);
// |lofi_requested| should be set to false when Lo-Fi is enabled using
@@ -289,7 +288,7 @@ TEST_F(ContentLoFiDeciderTest, LoFiFlags) {
VerifyLoFiHeader(!tests[i].is_using_lite_page, !tests[i].is_using_lofi,
headers);
VerifyLitePageHeader(false, false, headers);
- VerifyLitePageIgnoreBlacklistHeader(false, headers);
+ VerifyForceLitePageHeader(false, headers);
// The Lo-Fi flag is "cellular-only" and Lo-Fi is being used. Lo-Fi header
// should be added.
@@ -301,7 +300,7 @@ TEST_F(ContentLoFiDeciderTest, LoFiFlags) {
VerifyLoFiHeader(!tests[i].is_using_lite_page, !tests[i].is_using_lofi,
headers);
VerifyLitePageHeader(false, false, headers);
- VerifyLitePageIgnoreBlacklistHeader(false, headers);
+ VerifyForceLitePageHeader(false, headers);
data = DataReductionProxyData::GetData(*request);
// |lofi_requested| should be set to false when Lo-Fi is enabled using
// flags.
@@ -317,7 +316,7 @@ TEST_F(ContentLoFiDeciderTest, LoFiFlags) {
VerifyLoFiHeader(!tests[i].is_using_lite_page, !tests[i].is_using_lofi,
headers);
VerifyLitePageHeader(false, false, headers);
- VerifyLitePageIgnoreBlacklistHeader(false, headers);
+ VerifyForceLitePageHeader(false, headers);
data = DataReductionProxyData::GetData(*request);
// |lofi_requested| should be set to false when Lo-Fi is enabled using
// flags.
@@ -393,7 +392,7 @@ TEST_F(ContentLoFiDeciderTest, LoFiEnabledFieldTrial) {
VerifyLoFiHeader(is_lofi_resource_type, !tests[i].is_using_lofi, headers);
VerifyLitePageHeader(false, false, headers);
- VerifyLitePageIgnoreBlacklistHeader(false, headers);
+ VerifyForceLitePageHeader(false, headers);
DataReductionProxyData* data = DataReductionProxyData::GetData(*request);
EXPECT_EQ(tests[i].is_using_lofi, data->lofi_requested()) << i;
}
@@ -417,7 +416,7 @@ TEST_F(ContentLoFiDeciderTest, LoFiControlFieldTrial) {
NotifyBeforeSendHeaders(&headers, request.get(), true);
VerifyLoFiHeader(false, false, headers);
VerifyLitePageHeader(false, false, headers);
- VerifyLitePageIgnoreBlacklistHeader(false, headers);
+ VerifyForceLitePageHeader(false, headers);
DataReductionProxyData* data = DataReductionProxyData::GetData(*request);
EXPECT_EQ(tests[i].is_using_lofi, data->lofi_requested()) << i;
}
@@ -445,7 +444,7 @@ TEST_F(ContentLoFiDeciderTest, LitePageFieldTrial) {
VerifyLoFiHeader(false, false, headers);
VerifyLitePageHeader(tests[i].is_main_frame, !tests[i].is_using_lite_page,
headers);
- VerifyLitePageIgnoreBlacklistHeader(false, headers);
+ VerifyForceLitePageHeader(false, headers);
DataReductionProxyData* data = DataReductionProxyData::GetData(*request);
EXPECT_EQ(tests[i].is_using_lite_page, data->lofi_requested()) << i;
}
@@ -489,7 +488,7 @@ TEST_F(ContentLoFiDeciderTest, LitePageFieldTrialFallbackEnabled) {
VerifyLitePageHeader(tests[i].is_main_frame,
tests[i].is_main_frame && !tests[i].is_using_lite_page,
headers);
- VerifyLitePageIgnoreBlacklistHeader(false, headers);
+ VerifyForceLitePageHeader(false, headers);
DataReductionProxyData* data = DataReductionProxyData::GetData(*request);
EXPECT_EQ(tests[i].is_using_lofi || tests[i].is_using_lite_page,
data->lofi_requested())
@@ -529,7 +528,7 @@ TEST_F(ContentLoFiDeciderTest, LitePageFieldTrialFallbackDisabled) {
VerifyLitePageHeader(tests[i].is_main_frame,
tests[i].is_main_frame && !tests[i].is_using_lite_page,
headers);
- VerifyLitePageIgnoreBlacklistHeader(false, headers);
+ VerifyForceLitePageHeader(false, headers);
DataReductionProxyData* data = DataReductionProxyData::GetData(*request);
EXPECT_EQ(tests[i].is_using_lofi || tests[i].is_using_lite_page,
data->lofi_requested())
@@ -749,17 +748,17 @@ TEST_F(ContentLoFiDeciderTest, RemoveAcceptTransformHeader) {
EXPECT_FALSE(headers.HasHeader(chrome_proxy_accept_transform_header()));
}
-TEST_F(ContentLoFiDeciderTest, MaybeIgnoreBlacklist) {
+TEST_F(ContentLoFiDeciderTest, MaybeSetForceLitePageDirective) {
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
command_line->InitFromArgv(command_line->argv());
std::unique_ptr<data_reduction_proxy::ContentLoFiDecider> lofi_decider(
new data_reduction_proxy::ContentLoFiDecider());
net::HttpRequestHeaders headers;
- lofi_decider->MaybeSetIgnorePreviewsBlacklistDirective(&headers);
+ lofi_decider->MaybeSetForceLitePageDirective(&headers);
EXPECT_FALSE(headers.HasHeader(chrome_proxy_header()));
headers.SetHeader(chrome_proxy_header(), "Foo");
- lofi_decider->MaybeSetIgnorePreviewsBlacklistDirective(&headers);
+ lofi_decider->MaybeSetForceLitePageDirective(&headers);
std::string header_value;
headers.GetHeader(chrome_proxy_header(), &header_value);
EXPECT_EQ("Foo", header_value);
@@ -767,20 +766,20 @@ TEST_F(ContentLoFiDeciderTest, MaybeIgnoreBlacklist) {
headers.RemoveHeader(chrome_proxy_header());
command_line->AppendSwitch(switches::kEnableDataReductionProxyLitePage);
headers.SetHeader(chrome_proxy_accept_transform_header(), "empty-image");
- lofi_decider->MaybeSetIgnorePreviewsBlacklistDirective(&headers);
+ lofi_decider->MaybeSetForceLitePageDirective(&headers);
EXPECT_FALSE(headers.HasHeader(chrome_proxy_header()));
headers.SetHeader(chrome_proxy_accept_transform_header(), "lite-page");
- lofi_decider->MaybeSetIgnorePreviewsBlacklistDirective(&headers);
+ lofi_decider->MaybeSetForceLitePageDirective(&headers);
EXPECT_TRUE(headers.HasHeader(chrome_proxy_header()));
headers.GetHeader(chrome_proxy_header(), &header_value);
- EXPECT_EQ("exp=ignore_preview_blacklist", header_value);
+ EXPECT_EQ("exp=force_lite_page", header_value);
headers.SetHeader(chrome_proxy_header(), "Foo");
- lofi_decider->MaybeSetIgnorePreviewsBlacklistDirective(&headers);
+ lofi_decider->MaybeSetForceLitePageDirective(&headers);
EXPECT_TRUE(headers.HasHeader(chrome_proxy_header()));
headers.GetHeader(chrome_proxy_header(), &header_value);
- EXPECT_EQ("Foo, exp=ignore_preview_blacklist", header_value);
+ EXPECT_EQ("Foo, exp=force_lite_page", header_value);
}
TEST_F(ContentLoFiDeciderTest, NoTransformDoesNotAddHeader) {
« components/data_reduction_proxy/content/browser/content_lofi_decider.cc ('K') | « components/data_reduction_proxy/content/browser/content_lofi_decider.cc ('k') | components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate.cc » ('j') | components/data_reduction_proxy/core/common/data_reduction_proxy_headers.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698