DataReductionProxy proto change to use exp=force_lite_page directive

components/data_reduction_proxy/content/browser/content_lofi_decider_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/data_reduction_proxy/content/browser/content_lofi_decider.h"
 
 #include <stddef.h>
 #include <memory>
 #include <string>
 #include <utility>
@@ skipping 185 matching lines @@
                                 const net::HttpRequestHeaders& headers) {
     EXPECT_EQ(expected_compressed_video_used,
               headers.HasHeader(chrome_proxy_accept_transform_header()));
     std::string header_value;
     headers.GetHeader(chrome_proxy_accept_transform_header(), &header_value);
     EXPECT_EQ(
         expected_compressed_video_used,
         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);
   }
 
  protected:
   base::MessageLoopForIO message_loop_;
   net::TestURLRequestContext context_;
   net::TestDelegate delegate_;
   std::unique_ptr<DataReductionProxyTestContext> test_context_;
   std::unique_ptr<DataReductionProxyNetworkDelegate>
       data_reduction_proxy_network_delegate_;
@@ skipping 26 matching lines @@
     command_line->InitFromArgv(command_line->argv());
     if (tests[i].is_using_lite_page) {
       command_line->AppendSwitch(switches::kEnableDataReductionProxyLitePage);
     }
 
     // No flags or field trials. The Lo-Fi header should not be added.
     net::HttpRequestHeaders headers;
     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.
     command_line->AppendSwitchASCII(
         switches::kDataReductionProxyLoFi,
         switches::kDataReductionProxyLoFiValueAlwaysOn);
     headers.Clear();
     NotifyBeforeSendHeaders(&headers, request.get(), true);
     VerifyLoFiHeader(!tests[i].is_main_frame && !tests[i].is_using_lite_page,
                      !tests[i].is_main_frame && !tests[i].is_using_lofi &&
                          !tests[i].is_using_lite_page,
                      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
     // flags.
     EXPECT_FALSE(data->lofi_requested());
 
     // The Lo-Fi flag is "always-on" and Lo-Fi is being used. Lo-Fi header
     // should be added.
     AllocateRequestInfoForTesting(
         request.get(), content::RESOURCE_TYPE_SUB_FRAME, previews_state);
     headers.Clear();
     NotifyBeforeSendHeaders(&headers, request.get(), true);
     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.
     command_line->AppendSwitchASCII(
         switches::kDataReductionProxyLoFi,
         switches::kDataReductionProxyLoFiValueCellularOnly);
     headers.Clear();
     NotifyBeforeSendHeaders(&headers, request.get(), true);
     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.
     EXPECT_FALSE(data->lofi_requested());
 
     // The Lo-Fi flag is "slow-connections-only" and Lo-Fi is being used. Lo-Fi
     // header should be added.
     command_line->AppendSwitchASCII(
         switches::kDataReductionProxyLoFi,
         switches::kDataReductionProxyLoFiValueSlowConnectionsOnly);
     headers.Clear();
     NotifyBeforeSendHeaders(&headers, request.get(), true);
     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.
     EXPECT_FALSE(data->lofi_requested());
   }
 }
 
 TEST_F(ContentLoFiDeciderTest, LoFiEnabledFieldTrial) {
   base::FieldTrialList field_trial_list(nullptr);
   base::FieldTrialList::CreateFieldTrial(params::GetLoFiFieldTrialName(),
@@ skipping 55 matching lines @@
     bool is_lofi_resource_type =
         !(tests[i].resource_type == content::RESOURCE_TYPE_MAIN_FRAME ||
           tests[i].resource_type == content::RESOURCE_TYPE_STYLESHEET ||
           tests[i].resource_type == content::RESOURCE_TYPE_SCRIPT ||
           tests[i].resource_type == content::RESOURCE_TYPE_FONT_RESOURCE ||
           tests[i].resource_type == content::RESOURCE_TYPE_MEDIA ||
           tests[i].resource_type == content::RESOURCE_TYPE_CSP_REPORT);
 
     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;
   }
 }
 
 TEST_F(ContentLoFiDeciderTest, LoFiControlFieldTrial) {
   base::FieldTrialList field_trial_list(nullptr);
   base::FieldTrialList::CreateFieldTrial(params::GetLoFiFieldTrialName(),
                                          "Control");
   // Enable Lo-Fi.
   const struct {
     bool is_using_lofi;
     bool is_main_frame;
   } tests[] = {{false, false}, {false, true}, {true, false}, {true, true}};
 
   for (size_t i = 0; i < arraysize(tests); ++i) {
     std::unique_ptr<net::URLRequest> request = CreateRequest(
         tests[i].is_main_frame, tests[i].is_using_lofi ? content::SERVER_LOFI_ON
                                                        : content::PREVIEWS_OFF);
     net::HttpRequestHeaders headers;
     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;
   }
 }
 
 TEST_F(ContentLoFiDeciderTest, LitePageFieldTrial) {
   base::FieldTrialList field_trial_list(nullptr);
   base::FieldTrialList::CreateFieldTrial(params::GetLoFiFieldTrialName(),
                                          "Enabled_Preview");
   // Enable Lo-Fi.
   const struct {
     bool is_using_lite_page;
     bool is_main_frame;
   } tests[] = {
       {false, false}, {true, false}, {false, true}, {true, true},
   };
 
   for (size_t i = 0; i < arraysize(tests); ++i) {
     std::unique_ptr<net::URLRequest> request =
         CreateRequest(tests[i].is_main_frame, tests[i].is_using_lite_page
                                                   ? content::SERVER_LITE_PAGE_ON
                                                   : content::PREVIEWS_OFF);
     net::HttpRequestHeaders headers;
     NotifyBeforeSendHeaders(&headers, request.get(), true);
     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;
   }
 }
 
 TEST_F(ContentLoFiDeciderTest, LitePageFieldTrialFallbackEnabled) {
   base::FieldTrialList field_trial_list(nullptr);
   base::FieldTrialList::CreateFieldTrial(params::GetLoFiFieldTrialName(),
                                          "Enabled_Preview");
   base::FieldTrialList::CreateFieldTrial(
@@ skipping 23 matching lines @@
         CreateRequest(tests[i].is_main_frame, previews_state);
     net::HttpRequestHeaders headers;
     NotifyBeforeSendHeaders(&headers, request.get(), true);
     VerifyLoFiHeader(!tests[i].is_main_frame && !tests[i].is_using_lite_page,
                      !tests[i].is_main_frame && !tests[i].is_using_lofi &&
                          !tests[i].is_using_lite_page,
                      headers);
     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())
         << i;
   }
 }
 
 TEST_F(ContentLoFiDeciderTest, LitePageFieldTrialFallbackDisabled) {
   base::FieldTrialList field_trial_list(nullptr);
   base::FieldTrialList::CreateFieldTrial(params::GetLoFiFieldTrialName(),
@@ skipping 19 matching lines @@
       previews_state = content::PREVIEWS_OFF;
 
     std::unique_ptr<net::URLRequest> request =
         CreateRequest(tests[i].is_main_frame, previews_state);
     net::HttpRequestHeaders headers;
     NotifyBeforeSendHeaders(&headers, request.get(), true);
     VerifyLoFiHeader(false, false, headers);
     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())
         << i;
   }
 }
 
 TEST_F(ContentLoFiDeciderTest, AutoLoFi) {
   const struct {
     bool auto_lofi_enabled_group;
@@ skipping 199 matching lines @@
 TEST_F(ContentLoFiDeciderTest, RemoveAcceptTransformHeader) {
   std::unique_ptr<data_reduction_proxy::ContentLoFiDecider> lofi_decider(
       new data_reduction_proxy::ContentLoFiDecider());
   net::HttpRequestHeaders headers;
   headers.SetHeader(chrome_proxy_accept_transform_header(), "Foo");
   EXPECT_TRUE(headers.HasHeader(chrome_proxy_accept_transform_header()));
   lofi_decider->RemoveAcceptTransformHeader(&headers);
   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);
 
   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) {
   base::FieldTrialList field_trial_list(nullptr);
   base::FieldTrialList::CreateFieldTrial(params::GetLoFiFieldTrialName(),
                                          "Enabled");
   std::unique_ptr<net::URLRequest> request =
       CreateRequest(false, content::PREVIEWS_NO_TRANSFORM);
   net::HttpRequestHeaders headers;
   NotifyBeforeSendHeaders(&headers, request.get(), true);
@@ skipping 46 matching lines @@
                            content::CLIENT_LOFI_AUTO_RELOAD)));
 
   // IsClientLoFiAutoReloadRequest() should return false for any request without
   // the CLIENT_LOFI_AUTO_RELOAD bit set.
   EXPECT_FALSE(ContentLoFiDecider().IsClientLoFiAutoReloadRequest(
       *CreateRequestByType(content::RESOURCE_TYPE_IMAGE, false,
                            content::PREVIEWS_NO_TRANSFORM)));
 }
 
 }  // namespace data_reduction_proxy