| Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate_unittest.cc
|
| diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate_unittest.cc
|
| index f30883c9b4ed361dd7e1041582494156bd0edad3..0a50dfceb21078a6b1bb56eaf5a9f4a75d13e215 100644
|
| --- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate_unittest.cc
|
| +++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate_unittest.cc
|
| @@ -101,11 +101,11 @@ class TestLoFiDecider : public LoFiDecider {
|
| ignore_is_using_data_reduction_proxy_check_(false) {}
|
| ~TestLoFiDecider() override {}
|
|
|
| - bool IsUsingLoFiMode(const net::URLRequest& request) const override {
|
| + bool IsUsingLoFi(const net::URLRequest& request) const override {
|
| return should_request_lofi_resource_;
|
| }
|
|
|
| - void SetIsUsingLoFiMode(bool should_request_lofi_resource) {
|
| + void SetIsUsingLoFi(bool should_request_lofi_resource) {
|
| should_request_lofi_resource_ = should_request_lofi_resource;
|
| }
|
|
|
| @@ -529,8 +529,8 @@ TEST_F(DataReductionProxyNetworkDelegateTest, LoFiTransitions) {
|
| std::unique_ptr<net::URLRequest> fake_request =
|
| context()->CreateRequest(GURL(kTestURL), net::IDLE, &delegate);
|
| fake_request->SetLoadFlags(net::LOAD_MAIN_FRAME_DEPRECATED);
|
| - lofi_decider()->SetIsUsingLoFiMode(
|
| - config()->ShouldEnableLoFiMode(*fake_request.get()));
|
| + lofi_decider()->SetIsUsingLoFi(
|
| + config()->ShouldEnableLoFi(*fake_request.get()));
|
| NotifyNetworkDelegate(fake_request.get(), data_reduction_proxy_info,
|
| proxy_retry_info, &headers);
|
|
|
| @@ -538,7 +538,7 @@ TEST_F(DataReductionProxyNetworkDelegateTest, LoFiTransitions) {
|
| VerifyWasLoFiModeActiveOnMainFrame(tests[i].is_data_reduction_proxy);
|
| VerifyDataReductionProxyData(
|
| *fake_request, tests[i].is_data_reduction_proxy,
|
| - config()->ShouldEnableLoFiMode(*fake_request.get()));
|
| + config()->ShouldEnableLoFi(*fake_request.get()));
|
| }
|
|
|
| {
|
| @@ -548,7 +548,7 @@ TEST_F(DataReductionProxyNetworkDelegateTest, LoFiTransitions) {
|
| net::TestDelegate delegate;
|
| std::unique_ptr<net::URLRequest> fake_request =
|
| context()->CreateRequest(GURL(kTestURL), net::IDLE, &delegate);
|
| - lofi_decider()->SetIsUsingLoFiMode(false);
|
| + lofi_decider()->SetIsUsingLoFi(false);
|
| NotifyNetworkDelegate(fake_request.get(), data_reduction_proxy_info,
|
| proxy_retry_info, &headers);
|
| VerifyHeaders(tests[i].is_data_reduction_proxy, false, headers);
|
| @@ -567,7 +567,7 @@ TEST_F(DataReductionProxyNetworkDelegateTest, LoFiTransitions) {
|
| std::unique_ptr<net::URLRequest> fake_request =
|
| context()->CreateRequest(GURL(kTestURL), net::IDLE, &delegate);
|
|
|
| - lofi_decider()->SetIsUsingLoFiMode(true);
|
| + lofi_decider()->SetIsUsingLoFi(true);
|
| NotifyNetworkDelegate(fake_request.get(), data_reduction_proxy_info,
|
| proxy_retry_info, &headers);
|
| VerifyHeaders(tests[i].is_data_reduction_proxy, true, headers);
|
| @@ -587,7 +587,7 @@ TEST_F(DataReductionProxyNetworkDelegateTest, LoFiTransitions) {
|
| std::unique_ptr<net::URLRequest> fake_request =
|
| context()->CreateRequest(GURL(kTestURL), net::IDLE, &delegate);
|
| fake_request->SetLoadFlags(net::LOAD_MAIN_FRAME_DEPRECATED);
|
| - lofi_decider()->SetIsUsingLoFiMode(false);
|
| + lofi_decider()->SetIsUsingLoFi(false);
|
| NotifyNetworkDelegate(fake_request.get(), data_reduction_proxy_info,
|
| proxy_retry_info, &headers);
|
| VerifyHeaders(tests[i].is_data_reduction_proxy, false, headers);
|
| @@ -603,7 +603,7 @@ TEST_F(DataReductionProxyNetworkDelegateTest, LoFiTransitions) {
|
| net::TestDelegate delegate;
|
| std::unique_ptr<net::URLRequest> fake_request =
|
| context()->CreateRequest(GURL(kTestURL), net::IDLE, &delegate);
|
| - lofi_decider()->SetIsUsingLoFiMode(false);
|
| + lofi_decider()->SetIsUsingLoFi(false);
|
| NotifyNetworkDelegate(fake_request.get(), data_reduction_proxy_info,
|
| proxy_retry_info, &headers);
|
| VerifyHeaders(tests[i].is_data_reduction_proxy, false, headers);
|
| @@ -622,15 +622,15 @@ TEST_F(DataReductionProxyNetworkDelegateTest, LoFiTransitions) {
|
| std::unique_ptr<net::URLRequest> fake_request =
|
| context()->CreateRequest(GURL(kTestURL), net::IDLE, &delegate);
|
| fake_request->SetLoadFlags(net::LOAD_MAIN_FRAME_DEPRECATED);
|
| - lofi_decider()->SetIsUsingLoFiMode(
|
| - config()->ShouldEnableLoFiMode(*fake_request.get()));
|
| + lofi_decider()->SetIsUsingLoFi(
|
| + config()->ShouldEnableLoFi(*fake_request.get()));
|
| NotifyNetworkDelegate(fake_request.get(), data_reduction_proxy_info,
|
| proxy_retry_info, &headers);
|
| VerifyHeaders(tests[i].is_data_reduction_proxy, true, headers);
|
| VerifyWasLoFiModeActiveOnMainFrame(tests[i].is_data_reduction_proxy);
|
| VerifyDataReductionProxyData(
|
| *fake_request, tests[i].is_data_reduction_proxy,
|
| - config()->ShouldEnableLoFiMode(*fake_request.get()));
|
| + config()->ShouldEnableLoFi(*fake_request.get()));
|
| }
|
| }
|
| }
|
| @@ -683,7 +683,7 @@ TEST_F(DataReductionProxyNetworkDelegateTest, RequestDataConfigurations) {
|
| GURL(kTestURL), net::RequestPriority::IDLE, nullptr);
|
| request->SetLoadFlags(test.main_frame ? net::LOAD_MAIN_FRAME_DEPRECATED
|
| : 0);
|
| - lofi_decider()->SetIsUsingLoFiMode(test.lofi_on);
|
| + lofi_decider()->SetIsUsingLoFi(test.lofi_on);
|
| io_data()->request_options()->SetSecureSession("fake-session");
|
| network_delegate()->NotifyBeforeSendHeaders(
|
| request.get(), data_reduction_proxy_info, proxy_retry_info, &headers);
|
| @@ -771,7 +771,7 @@ TEST_F(DataReductionProxyNetworkDelegateTest, RedirectRequestDataCleared) {
|
| std::unique_ptr<net::URLRequest> request = context()->CreateRequest(
|
| GURL(kTestURL), net::RequestPriority::IDLE, nullptr);
|
| request->SetLoadFlags(net::LOAD_MAIN_FRAME_DEPRECATED);
|
| - lofi_decider()->SetIsUsingLoFiMode(true);
|
| + lofi_decider()->SetIsUsingLoFi(true);
|
| io_data()->request_options()->SetSecureSession("fake-session");
|
| network_delegate()->NotifyBeforeSendHeaders(
|
| request.get(), data_reduction_proxy_info, proxy_retry_info, &headers);
|
| @@ -917,8 +917,8 @@ TEST_F(DataReductionProxyNetworkDelegateTest, NetHistograms) {
|
| switches::kDataReductionProxyLoFiValueAlwaysOn);
|
| }
|
|
|
| - lofi_decider()->SetIsUsingLoFiMode(
|
| - config()->ShouldEnableLoFiMode(*fake_request.get()));
|
| + lofi_decider()->SetIsUsingLoFi(
|
| + config()->ShouldEnableLoFi(*fake_request.get()));
|
|
|
| fake_request = (FetchURLRequest(GURL(kTestURL), nullptr, response_headers,
|
| kResponseContentLength));
|
|
|