Introduce ResourceRequesterInfo to abstract the requester of resource request

content/browser/loader/resource_dispatcher_host_impl.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This is the browser side of the resource dispatcher, it receives requests
 // from the child process (i.e. [Renderer, Plugin, Worker]ProcessHost), and
 // dispatches them to URLRequests. It then forwards the messages from the
 // URLRequests back to the correct process for handling.
 //
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
@@ skipping 46 matching lines @@
 class AsyncRevalidationManager;
 class LoaderDelegate;
 class NavigationURLLoaderImplCore;
 class NavigationUIData;
 class RenderFrameHostImpl;
 class ResourceContext;
 class ResourceDispatcherHostDelegate;
 class ResourceHandler;
 class ResourceMessageDelegate;
 class ResourceMessageFilter;
+class ResourceRequesterInfo;
 class ResourceRequestInfoImpl;
 class ServiceWorkerNavigationHandleCore;
 struct NavigationRequestInfo;
 struct Referrer;
 struct ResourceRequest;
 
 namespace mojom {
 class URLLoader;
 }  // namespace mojom
 
@@ skipping 217 matching lines @@
 
   void OnRenderFrameDeleted(const GlobalFrameRoutingId& global_routing_id);
 
   // Called when loading a request with mojo.
   void OnRequestResourceWithMojo(
       int routing_id,
       int request_id,
       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
   // we mean setting the |referrer| on the |request|, associating the
   // ResourceRequestInfoImpl structure with the |request|, etc.
   // This function should be called for invoking the BeginURLRequest() function
   // to initiate a URL request.
   void InitializeURLRequest(net::URLRequest* request,
                             const Referrer& referrer,
                             bool is_download,
@@ skipping 258 matching lines @@
       bool continue_request,
       int error_code);
 
   // Creates a ResourceHandler to be used by BeginRequest() for normal resource
   // loading.
   std::unique_ptr<ResourceHandler> CreateResourceHandler(
       net::URLRequest* request,
       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,
       mojom::URLLoaderClientAssociatedPtr url_loader_client);
 
   // Wraps |handler| in the standard resource handlers for normal resource
   // loading and navigation requests. This adds MimeTypeResourceHandler and
   // ResourceThrottles.
   std::unique_ptr<ResourceHandler> AddStandardHandlers(
       net::URLRequest* request,
@@ skipping 43 matching lines @@
   ResourceLoader* GetLoader(int child_id, int request_id) const;
 
   // Registers |delegate| to receive resource IPC messages targeted to the
   // specified |id|.
   void RegisterResourceMessageDelegate(const GlobalRequestID& id,
                                        ResourceMessageDelegate* delegate);
   void UnregisterResourceMessageDelegate(const GlobalRequestID& id,
                                          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
   // started. The function returns the |handler| passed in, if the download
   // is not throttled. If the download is to be throttled (Decided by the
   // delegate) the function returns a ThrottlingResourceHandler to handle the
   // download.
   std::unique_ptr<ResourceHandler> HandleDownloadStarted(
       net::URLRequest* request,
       std::unique_ptr<ResourceHandler> handler,
@@ skipping 63 matching lines @@
   //       kAvgBytesPerOutstandingRequest)
   int max_outstanding_requests_cost_per_process_;
 
   // Time of the last user gesture. Stored so that we can add a load
   // flag to requests occurring soon after a gesture to indicate they
   // may be because of explicit user action.
   base::TimeTicks last_user_gesture_time_;
 
   // 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_;
 
   LoaderDelegate* loader_delegate_;
 
   bool allow_cross_origin_auth_prompt_;
 
   // AsyncRevalidationManager is non-NULL if and only if
   // stale-while-revalidate is enabled.
   std::unique_ptr<AsyncRevalidationManager> async_revalidation_manager_;
 
   typedef std::map<GlobalRequestID,
                    base::ObserverList<ResourceMessageDelegate>*> DelegateMap;
   DelegateMap delegate_map_;
 
   std::unique_ptr<ResourceScheduler> scheduler_;
 
   // Used to invoke an interceptor for the HTTP header.
   HeaderInterceptorMap http_header_interceptor_map_;
 
   // Points to the registered download handler intercept.
   CreateDownloadHandlerIntercept create_download_handler_intercept_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceDispatcherHostImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_LOADER_RESOURCE_DISPATCHER_HOST_IMPL_H_