Network servicification: Plumb ResourceContext through WebRequestProxyingURLLoaderFactory.

This CL plumbs the ResourceContext to the WebRequestInfo structure through
WebRequestProxyingURLLoaderFactory. This is necessary to fix
NTPInterceptionWebRequestAPITest.NTPRendererRequestsHidden for the network
servicification path.

BUG=797461, 721414

Cq-Include-Trybots: master.tryserver.chromium.linux:linux_mojo
Change-Id: I2957c1ece0f8f7b44f15156aeb5e554b3a91ff01
Reviewed-on: https://chromium-review.googlesource.com/1029549Reviewed-by: Ken Rockot <rockot@chromium.org>
Commit-Queue: Karan Bhatia <karandeepb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#554556}

extensions/browser/api/web_request/web_request_api.cc

@@ -26,6 +26,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "base/values.h"
+#include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
@@ -451,7 +452,9 @@ bool WebRequestAPI::MaybeProxyURLLoaderFactory(
   }
 
   auto proxy = base::MakeRefCounted<WebRequestProxyingURLLoaderFactory>(
-      frame->GetProcess()->GetBrowserContext(), info_map_);
+      frame->GetProcess()->GetBrowserContext(),
+      frame->GetProcess()->GetBrowserContext()->GetResourceContext(),
+      info_map_);
   proxies_.emplace(proxy.get(), proxy);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,

extensions/browser/api/web_request/web_request_info.cc

@@ -287,6 +287,7 @@ WebRequestInfo::WebRequestInfo(
     int render_frame_id,
     std::unique_ptr<ExtensionNavigationUIData> navigation_ui_data,
     int32_t routing_id,
+    content::ResourceContext* resource_context,
     const network::ResourceRequest& request)
     : id(request_id),
       url(request.url),
@@ -299,7 +300,8 @@ WebRequestInfo::WebRequestInfo(
       initiator(request.request_initiator),
       type(static_cast<content::ResourceType>(request.resource_type)),
       extra_request_headers(request.headers),
-      logger(std::make_unique<NetworkServiceLogger>()) {
+      logger(std::make_unique<NetworkServiceLogger>()),
+      resource_context(resource_context) {
   if (url.SchemeIsWSOrWSS())
     web_request_type = WebRequestResourceType::WEB_SOCKET;
   else

extensions/browser/api/web_request/web_request_info.h

@@ -74,6 +74,7 @@ struct WebRequestInfo {
                  int render_frame_id,
                  std::unique_ptr<ExtensionNavigationUIData> navigation_ui_data,
                  int32_t routing_id,
+                 content::ResourceContext* resource_context,
                  const network::ResourceRequest& request);
 
   ~WebRequestInfo();

extensions/browser/api/web_request/web_request_proxying_url_loader_factory.cc

@@ -52,7 +52,7 @@ void WebRequestProxyingURLLoaderFactory::InProgressRequest::Restart() {
       request_id_, factory_->render_process_id_, factory_->render_frame_id_,
       factory_->navigation_ui_data_ ? factory_->navigation_ui_data_->DeepCopy()
                                     : nullptr,
-      routing_id_, request_);
+      routing_id_, factory_->resource_context_, request_);
 
   auto continuation =
       base::BindRepeating(&InProgressRequest::ContinueToBeforeSendHeaders,
@@ -404,10 +404,12 @@ void WebRequestProxyingURLLoaderFactory::InProgressRequest::OnRequestError(
 
 WebRequestProxyingURLLoaderFactory::WebRequestProxyingURLLoaderFactory(
     void* browser_context,
+    content::ResourceContext* resource_context,
     InfoMap* info_map)
     : RefCountedDeleteOnSequence(content::BrowserThread::GetTaskRunnerForThread(
           content::BrowserThread::IO)),
       browser_context_(browser_context),
+      resource_context_(resource_context),
       info_map_(info_map) {}
 
 void WebRequestProxyingURLLoaderFactory::StartProxying(

extensions/browser/api/web_request/web_request_proxying_url_loader_factory.h

@@ -25,6 +25,10 @@
 #include "services/network/public/mojom/url_loader_factory.mojom.h"
 #include "url/gurl.h"
 
+namespace content {
+class ResourceContext;
+}  // namespace content
+
 namespace extensions {
 
 class ExtensionNavigationUIData;
@@ -131,7 +135,9 @@ class WebRequestProxyingURLLoaderFactory
     DISALLOW_COPY_AND_ASSIGN(InProgressRequest);
   };
 
-  WebRequestProxyingURLLoaderFactory(void* browser_context, InfoMap* info_map);
+  WebRequestProxyingURLLoaderFactory(void* browser_context,
+                                     content::ResourceContext* resource_context,
+                                     InfoMap* info_map);
 
   void StartProxying(
       int render_process_id,
@@ -164,6 +170,7 @@ class WebRequestProxyingURLLoaderFactory
   void RemoveRequest(uint64_t request_id);
 
   void* const browser_context_;
+  content::ResourceContext* const resource_context_;
   int render_process_id_ = -1;
   int render_frame_id_ = -1;
   std::unique_ptr<ExtensionNavigationUIData> navigation_ui_data_;

testing/buildbot/filters/mojo.fyi.network_browser_tests.filter

@@ -154,7 +154,6 @@
 -ExtensionWebRequestApiTest.WebRequestDeclarative2
 -ExtensionWebRequestApiTest.WebRequestDiceHeaderProtection
 -ExtensionWebRequestApiTest.WebRequestTypes
--NTPInterceptionWebRequestAPITest.NTPRendererRequestsHidden
 
 # https://crbug.com/721400
 # WebSocket with the network service