Remove unused lofi_requested field from DataReductionProxyData

This field was only being used in tests.

Bug: 721403
Change-Id: I58d0bb526827c54a706d4bf16b42efebf9ea2f81
Reviewed-on: https://chromium-review.googlesource.com/c/1301962Reviewed-by: Ryan Sturm <ryansturm@chromium.org>
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#603137}

components/data_reduction_proxy/content/browser/content_lofi_decider.cc

@@ -74,18 +74,6 @@ void ContentLoFiDecider::RemoveAcceptTransformHeader(
   headers->RemoveHeader(chrome_proxy_accept_transform_header());
 }
 
-bool ContentLoFiDecider::ShouldRecordLoFiUMA(
-    const net::URLRequest& request) const {
-  const content::ResourceRequestInfo* request_info =
-      content::ResourceRequestInfo::ForRequest(&request);
-
-  if (!request_info)
-    return false;
-
-  return request_info->GetPreviewsState() & content::SERVER_LOFI_ON ||
-         request_info->GetPreviewsState() & content::SERVER_LITE_PAGE_ON;
-}
-
 bool ContentLoFiDecider::IsClientLoFiImageRequest(
     const net::URLRequest& request) const {
   const content::ResourceRequestInfo* request_info =

components/data_reduction_proxy/content/browser/content_lofi_decider.h

@@ -43,7 +43,6 @@ class ContentLoFiDecider : public LoFiDecider {
       net::HttpRequestHeaders* headers) const override;
   void RemoveAcceptTransformHeader(
       net::HttpRequestHeaders* headers) const override;
-  bool ShouldRecordLoFiUMA(const net::URLRequest& request) const override;
   bool IsClientLoFiImageRequest(const net::URLRequest& request) const override;
   bool IsClientLoFiAutoReloadRequest(
       const net::URLRequest& request) const override;

components/data_reduction_proxy/content/browser/content_lofi_decider_unittest.cc

@@ -425,20 +425,6 @@ TEST_F(ContentLoFiDeciderTest, RemoveAcceptTransformHeader) {
   EXPECT_FALSE(headers.HasHeader(chrome_proxy_accept_transform_header()));
 }
 
-TEST_F(ContentLoFiDeciderTest, ShouldRecordLoFiUMA) {
-  std::unique_ptr<data_reduction_proxy::ContentLoFiDecider> lofi_decider(
-      new data_reduction_proxy::ContentLoFiDecider());
-  std::unique_ptr<net::URLRequest> request1 = CreateRequestByType(
-      content::RESOURCE_TYPE_IMAGE, false, content::SERVER_LOFI_ON);
-  EXPECT_TRUE(lofi_decider->ShouldRecordLoFiUMA(*request1));
-  std::unique_ptr<net::URLRequest> request2 = CreateRequestByType(
-      content::RESOURCE_TYPE_MAIN_FRAME, false, content::PREVIEWS_OFF);
-  EXPECT_FALSE(lofi_decider->ShouldRecordLoFiUMA(*request2));
-  std::unique_ptr<net::URLRequest> request3 = CreateRequestByType(
-      content::RESOURCE_TYPE_MAIN_FRAME, false, content::SERVER_LITE_PAGE_ON);
-  EXPECT_TRUE(lofi_decider->ShouldRecordLoFiUMA(*request3));
-}
-
 TEST_F(ContentLoFiDeciderTest, NoTransformDoesNotAddHeader) {
   std::unique_ptr<net::URLRequest> request =
       CreateRequest(false, content::PREVIEWS_NO_TRANSFORM);

components/data_reduction_proxy/core/browser/data_reduction_proxy_data.cc

@@ -32,7 +32,6 @@ DataReductionProxyData::RequestInfo::RequestInfo(const RequestInfo& other)
 
 DataReductionProxyData::DataReductionProxyData()
     : used_data_reduction_proxy_(false),
-      lofi_requested_(false),
       client_lofi_requested_(false),
       lite_page_received_(false),
       lofi_policy_received_(false),

components/data_reduction_proxy/core/browser/data_reduction_proxy_data.h

@@ -73,14 +73,6 @@ class DataReductionProxyData : public base::SupportsUserData::Data {
     used_data_reduction_proxy_ = used_data_reduction_proxy;
   }
 
-  // Whether Lo-Fi was requested for this request or navigation. True if the
-  // session is in Lo-Fi control or enabled group, and the network quality is
-  // slow.
-  bool lofi_requested() const { return lofi_requested_; }
-  void set_lofi_requested(bool lofi_requested) {
-    lofi_requested_ = lofi_requested;
-  }
-
   // Whether a lite page response was seen for the request or navigation.
   bool lite_page_received() const { return lite_page_received_; }
   void set_lite_page_received(bool lite_page_received) {
@@ -201,11 +193,6 @@ class DataReductionProxyData : public base::SupportsUserData::Data {
   // Cached responses are not considered to have used DRP.
   bool used_data_reduction_proxy_;
 
-  // Whether server Lo-Fi was requested for this request or navigation. True if
-  // the session is in Lo-Fi control or enabled group, and the network quality
-  // is slow.
-  bool lofi_requested_;
-
   // Whether client Lo-Fi was requested for this request. This is only set on
   // image requests that have added a range header to attempt to get a smaller
   // file size image.

components/data_reduction_proxy/core/browser/data_reduction_proxy_data_unittest.cc

@@ -38,12 +38,6 @@ TEST_F(DataReductionProxyDataTest, BasicSettersAndGetters) {
   data->set_used_data_reduction_proxy(false);
   EXPECT_FALSE(data->used_data_reduction_proxy());
 
-  EXPECT_FALSE(data->lofi_requested());
-  data->set_lofi_requested(true);
-  EXPECT_TRUE(data->lofi_requested());
-  data->set_lofi_requested(false);
-  EXPECT_FALSE(data->lofi_requested());
-
   EXPECT_FALSE(data->lite_page_received());
   data->set_lite_page_received(true);
   EXPECT_TRUE(data->lite_page_received());
@@ -154,7 +148,6 @@ TEST_F(DataReductionProxyDataTest, DeepCopy) {
         base::TimeDelta(), base::TimeDelta(), base::TimeDelta()));
     std::unique_ptr<DataReductionProxyData> data(new DataReductionProxyData());
     data->set_used_data_reduction_proxy(tests[i].data_reduction_used);
-    data->set_lofi_requested(tests[i].lofi_test_value);
     data->set_lite_page_received(tests[i].lofi_test_value);
     data->set_lofi_received(tests[i].lofi_test_value);
     data->set_black_listed(tests[i].lofi_test_value);
@@ -165,7 +158,6 @@ TEST_F(DataReductionProxyDataTest, DeepCopy) {
     data->set_request_info(request_info);
     data->set_page_id(2u);
     std::unique_ptr<DataReductionProxyData> copy = data->DeepCopy();
-    EXPECT_EQ(tests[i].lofi_test_value, copy->lofi_requested());
     EXPECT_EQ(tests[i].lofi_test_value, copy->lite_page_received());
     EXPECT_EQ(tests[i].lofi_test_value, copy->lofi_received());
     EXPECT_EQ(tests[i].lofi_test_value, copy->black_listed());

components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate.cc

@@ -419,8 +419,6 @@ void DataReductionProxyNetworkDelegate::OnBeforeSendHeadersInternal(
   }
 
   DCHECK(data);
-  data->set_lofi_requested(
-      lofi_decider ? lofi_decider->ShouldRecordLoFiUMA(*request) : false);
   MaybeAddBrotliToAcceptEncodingHeader(proxy_info, headers, *request);
 
   data_reduction_proxy_request_options_->AddRequestHeader(headers, page_id);

components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate_unittest.cc

@@ -227,10 +227,6 @@ class TestLoFiDecider : public LoFiDecider {
     headers->RemoveHeader(chrome_proxy_accept_transform_header());
   }
 
-  bool ShouldRecordLoFiUMA(const net::URLRequest& request) const override {
-    return should_request_lofi_resource_;
-  }
-
   bool IsClientLoFiImageRequest(const net::URLRequest& request) const override {
     return should_be_client_lofi_;
   }
@@ -454,7 +450,6 @@ class DataReductionProxyNetworkDelegateTest : public testing::Test {
       EXPECT_FALSE(data);
     } else {
       EXPECT_TRUE(data->used_data_reduction_proxy());
-      EXPECT_EQ(lofi_used, data->lofi_requested());
     }
   }
 
@@ -1105,7 +1100,6 @@ TEST_F(DataReductionProxyNetworkDelegateTest, RequestDataConfigurations) {
       EXPECT_TRUE(data->used_data_reduction_proxy());
       EXPECT_EQ(test.main_frame ? GURL(kTestURL) : GURL(), data->request_url());
       EXPECT_EQ(test.main_frame ? "fake-session" : "", data->session_key());
-      EXPECT_EQ(test.lofi_on, data->lofi_requested());
     }
   }
 }
@@ -1213,7 +1207,6 @@ TEST_F(DataReductionProxyNetworkDelegateTest, RedirectRequestDataCleared) {
   EXPECT_TRUE(data->used_data_reduction_proxy());
   EXPECT_EQ(GURL(kTestURL), data->request_url());
   EXPECT_EQ("fake-session", data->session_key());
-  EXPECT_TRUE(data->lofi_requested());
 
   data_reduction_proxy_info.UseNamedProxy("port.of.other.proxy");
 

components/data_reduction_proxy/core/common/lofi_decider.h

@@ -31,11 +31,6 @@ class LoFiDecider {
   virtual void RemoveAcceptTransformHeader(
       net::HttpRequestHeaders* headers) const = 0;
 
-  // Returns true if the Lo-Fi specific UMA should be recorded. It is set to
-  // true if Lo-Fi is enabled for |request|, Chrome session is in Lo-Fi
-  // Enabled or Control field trial, and the network quality was slow.
-  virtual bool ShouldRecordLoFiUMA(const net::URLRequest& request) const = 0;
-
   // Returns whether the request was a client-side Lo-Fi image request.
   virtual bool IsClientLoFiImageRequest(
       const net::URLRequest& request) const = 0;