Remove ResourceContext usage from PreviewsLitePageURLLoaderInterceptor

This path is no longer used now that NavigationLoaderOnUI is default.

Bug: 979264
Change-Id: Iacfd172d4f1eaa742f642b712279841995db4cd6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1744285
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Commit-Queue: John Abd-El-Malek <jam@chromium.org>
Auto-Submit: Clark DuVall <cduvall@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#685252}

chrome/browser/previews/previews_lite_page_url_loader_interceptor.cc

@@ -49,29 +49,12 @@ bool ShouldCreateLoader(const network::ResourceRequest& resource_request) {
 
 net::HttpRequestHeaders GetChromeProxyHeaders(
     content::BrowserContext* browser_context,
-    content::ResourceContext* resource_context,
     uint64_t page_id) {
   net::HttpRequestHeaders headers;
   // Return empty headers for unittests.
-  if (!resource_context && !browser_context)
+  if (!browser_context)
     return headers;
 
-  DCHECK(!(resource_context && browser_context));
-  if (resource_context) {
-    auto* io_data = ProfileIOData::FromResourceContext(resource_context);
-    if (io_data && io_data->data_reduction_proxy_io_data()) {
-      DCHECK(data_reduction_proxy::params::IsEnabledWithNetworkService());
-      data_reduction_proxy::DataReductionProxyRequestOptions* request_options =
-          io_data->data_reduction_proxy_io_data()->request_options();
-      request_options->AddRequestHeader(&headers, page_id != 0U ? page_id : 1);
-
-      headers.SetHeader(data_reduction_proxy::chrome_proxy_ect_header(),
-                        net::GetNameForEffectiveConnectionType(
-                            io_data->data_reduction_proxy_io_data()
-                                ->GetEffectiveConnectionType()));
-    }
-  } else {
-    DCHECK(browser_context);
   auto* settings =
       DataReductionProxyChromeSettingsFactory::GetForBrowserContext(
           browser_context);
@@ -80,8 +63,8 @@ net::HttpRequestHeaders GetChromeProxyHeaders(
     std::string header;
     if (settings->GetProxyRequestHeaders().GetHeader(
             data_reduction_proxy::chrome_proxy_header(), &header)) {
-        data_reduction_proxy::DataReductionProxyRequestOptions::
-            AddRequestHeader(&headers, page_id != 0U ? page_id : 1, header);
+      data_reduction_proxy::DataReductionProxyRequestOptions::AddRequestHeader(
+          &headers, page_id != 0U ? page_id : 1, header);
     }
 
     headers.SetHeader(data_reduction_proxy::chrome_proxy_ect_header(),
@@ -89,7 +72,6 @@ net::HttpRequestHeaders GetChromeProxyHeaders(
                           settings->data_reduction_proxy_service()
                               ->GetEffectiveConnectionType()));
   }
-  }
 
   return headers;
 }
@@ -144,7 +126,7 @@ void PreviewsLitePageURLLoaderInterceptor::MaybeCreateLoader(
 
   if (ShouldCreateLoader(tentative_resource_request)) {
     CreateRedirectLoader(tentative_resource_request, browser_context,
-                         resource_context, std::move(callback));
+                         std::move(callback));
     return;
   }
   RecordInterceptAttempt(false);
@@ -154,7 +136,6 @@ void PreviewsLitePageURLLoaderInterceptor::MaybeCreateLoader(
 void PreviewsLitePageURLLoaderInterceptor::CreateRedirectLoader(
     const network::ResourceRequest& tentative_resource_request,
     content::BrowserContext* browser_context,
-    content::ResourceContext* resource_context,
     content::URLLoaderRequestInterceptor::LoaderCallback callback) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
@@ -168,8 +149,8 @@ void PreviewsLitePageURLLoaderInterceptor::CreateRedirectLoader(
 
   // |redirect_url_loader_| can be null after this call.
   redirect_url_loader_->StartRedirectToPreview(
-      GetChromeProxyHeaders(browser_context, resource_context, page_id_),
-      network_loader_factory_, frame_tree_node_id_);
+      GetChromeProxyHeaders(browser_context, page_id_), network_loader_factory_,
+      frame_tree_node_id_);
 }
 
 void PreviewsLitePageURLLoaderInterceptor::CreateOriginalURLLoader(

chrome/browser/previews/previews_lite_page_url_loader_interceptor.h

@@ -45,7 +45,6 @@ class PreviewsLitePageURLLoaderInterceptor
   void CreateRedirectLoader(
       const network::ResourceRequest& tentative_resource_request,
       content::BrowserContext* browser_context,
-      content::ResourceContext* resource_context,
       content::URLLoaderRequestInterceptor::LoaderCallback callback);
 
   // Creates a redirect URL loader that immediately serves a redirect to