Introduce ResourceRequesterInfo to abstract the requester of resource request

content/browser/loader/resource_dispatcher_host_impl.h

Index: content/browser/loader/resource_dispatcher_host_impl.h
diff --git a/content/browser/loader/resource_dispatcher_host_impl.h b/content/browser/loader/resource_dispatcher_host_impl.h
index a8fff5e60853cdbb913a7f5cda7ca5afe5e4509f..be09eaf30d73e2ea0e8f92573c9e418f27b94f07 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.h
+++ b/content/browser/loader/resource_dispatcher_host_impl.h
@@ -64,6 +64,7 @@ class ResourceDispatcherHostDelegate;
 class ResourceHandler;
 class ResourceMessageDelegate;
 class ResourceMessageFilter;
+class ResourceRequesterInfo;
 class ResourceRequestInfoImpl;
 class ServiceWorkerNavigationHandleCore;
 struct NavigationRequestInfo;
@@ -301,12 +302,12 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
       const ResourceRequest& request,
       mojom::URLLoaderAssociatedRequest mojo_request,
       mojom::URLLoaderClientAssociatedPtr url_loader_client,
-      ResourceMessageFilter* filter);
+      std::unique_ptr<ResourceRequesterInfo> requester_info);
 
   void OnSyncLoadWithMojo(int routing_id,
                           int request_id,
                           const ResourceRequest& request_data,
-                          ResourceMessageFilter* filter,
+                          std::unique_ptr<ResourceRequesterInfo> requester_info,
                           const SyncLoadResultCallback& result_handler);
 
   // Helper function for initializing the |request| passed in. By initializing
@@ -585,7 +586,6 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
       const ResourceRequest& request_data,
       const SyncLoadResultCallback& sync_result_handler,
       int route_id,
-      int process_type,
       int child_id,
       ResourceContext* resource_context,
       mojom::URLLoaderAssociatedRequest mojo_request,
@@ -649,18 +649,16 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
                                          ResourceMessageDelegate* delegate);
 
   int BuildLoadFlagsForRequest(const ResourceRequest& request_data,
-                               int child_id,
                                bool is_sync_load);
 
   // Consults the RendererSecurity policy to determine whether the
   // ResourceDispatcherHostImpl should service this request.  A request might
   // be disallowed if the renderer is not authorized to retrieve the request
   // URL or if the renderer is attempting to upload an unauthorized file.
-  bool ShouldServiceRequest(int process_type,
-                            int child_id,
+  bool ShouldServiceRequest(int child_id,
                             const ResourceRequest& request_data,
                             const net::HttpRequestHeaders& headers,
-                            ResourceMessageFilter* filter,
+                            ResourceRequesterInfo* requester_info,
                             ResourceContext* resource_context);
 
   // Notifies the ResourceDispatcherHostDelegate about a download having
@@ -744,7 +742,7 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
 
   // Used during IPC message dispatching so that the handlers can get a pointer
   // to the source of the message.
-  ResourceMessageFilter* filter_;
+  std::unique_ptr<ResourceRequesterInfo> requester_info_;

[kinuko, 2016/11/10 08:17:57]

RDH is browser process global object, owning ResourceRequesterInfo for each
request feels wrong to me.

[horo, 2016/11/10 14:46:33]

Done.

 
   ResourceDispatcherHostDelegate* delegate_;