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 48 matching lines @@
 class LoaderDelegate;
 class NavigationURLLoaderImplCore;
 class NavigationUIData;
 class RenderFrameHostImpl;
 class ResourceContext;
 class ResourceDispatcherHostDelegate;
 class ResourceLoader;
 class ResourceHandler;
 class ResourceMessageDelegate;
 class ResourceMessageFilter;
+class ResourceRequesterInfo;
 class ResourceRequestInfoImpl;
 class ResourceScheduler;
 class ServiceWorkerNavigationHandleCore;
 struct NavigationRequestInfo;
 struct Referrer;
 struct ResourceRequest;
 
 using CreateDownloadHandlerIntercept =
     base::Callback<std::unique_ptr<ResourceHandler>(net::URLRequest*)>;
 
@@ skipping 49 matching lines @@
   // new requests).  Cancels all pending requests.
   void Shutdown();
 
   // Force cancels any pending requests for the given |context|. This is
   // necessary to ensure that before |context| goes away, all requests
   // for it are dead.
   void CancelRequestsForContext(ResourceContext* context);
 
   // Returns true if the message was a resource message that was processed.
   bool OnMessageReceived(const IPC::Message& message,
-                         ResourceMessageFilter* filter);
+                         const ResourceRequesterInfo* requester_info);
 
   // Cancels the given request if it still exists.
   void CancelRequest(int child_id, int request_id);
 
   // Marks the request, with its current |response|, as "parked". This
   // happens if a request is redirected cross-site and needs to be
   // resumed by a new process.
   void MarkAsTransferredNavigation(
       const GlobalRequestID& id,
       const base::Closure& on_transfer_complete_callback);
@@ skipping 139 matching lines @@
   void EnableStaleWhileRevalidateForTesting();
 
   // Sets the LoaderDelegate, which must outlive this object. Ownership is not
   // transferred. The LoaderDelegate should be interacted with on the IO thread.
   void SetLoaderDelegate(LoaderDelegate* loader_delegate);
 
   void OnRenderFrameDeleted(const GlobalFrameRoutingId& global_routing_id);
 
   // Called when loading a request with mojo.
   void OnRequestResourceWithMojo(
+      const ResourceRequesterInfo* requester_info,
       int routing_id,
       int request_id,
       const ResourceRequest& request,
       mojom::URLLoaderAssociatedRequest mojo_request,
-      mojom::URLLoaderClientAssociatedPtr url_loader_client,
-      ResourceMessageFilter* filter);
+      mojom::URLLoaderClientAssociatedPtr url_loader_client);
 
-  void OnSyncLoadWithMojo(int routing_id,
+  void OnSyncLoadWithMojo(const ResourceRequesterInfo* requester_info,
+                          int routing_id,
                           int request_id,
                           const ResourceRequest& request_data,
-                          ResourceMessageFilter* filter,
                           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 199 matching lines @@
   std::unique_ptr<LoadInfoList> GetLoadInfoForAllRoutes();
 
   // Checks all pending requests and updates the load info if necessary.
   void UpdateLoadInfo();
 
   // Resumes or cancels (if |cancel_requests| is true) any blocked requests.
   void ProcessBlockedRequestsForRoute(
       const GlobalFrameRoutingId& global_routing_id,
       bool cancel_requests);
 
-  void OnRequestResource(int routing_id,
+  void OnRequestResource(const ResourceRequesterInfo* requester_info,

[kinuko, 2016/11/21 13:36:25]

Wondering if many of these methods should also take scoped_refptr (and std::move
along) as some of them are eventually taking the ref for async handling.  (I'd
like to defer the final decision to module owner / mmenke though)

+                         int routing_id,
                          int request_id,
                          const ResourceRequest& request_data);
 
   void OnRequestResourceInternal(
+      const ResourceRequesterInfo* requester_info,
       int routing_id,
       int request_id,
       const ResourceRequest& request_data,
       mojom::URLLoaderAssociatedRequest mojo_request,
       mojom::URLLoaderClientAssociatedPtr url_loader_client);
 
-  void OnSyncLoad(int request_id,
+  void OnSyncLoad(const ResourceRequesterInfo* requester_info,
+                  int request_id,
                   const ResourceRequest& request_data,
                   IPC::Message* sync_result);
 
   bool IsRequestIDInUse(const GlobalRequestID& id) const;
 
   // Update the ResourceRequestInfo and internal maps when a request is
   // transferred from one process to another.
-  void UpdateRequestForTransfer(int child_id,
+  void UpdateRequestForTransfer(const ResourceRequesterInfo* requester_info,
                                 int route_id,
                                 int request_id,
                                 const ResourceRequest& request_data,
                                 LoaderMap::iterator iter);
 
   // If |request_data| is for a request being transferred from another process,
   // then CompleteTransfer method can be used to complete the transfer.
-  void CompleteTransfer(int request_id,
+  void CompleteTransfer(const ResourceRequesterInfo* requester_info,
+                        int request_id,
                         const ResourceRequest& request_data,
                         int route_id);
 
   void BeginRequest(
+      const ResourceRequesterInfo* requester_info,
       int request_id,
       const ResourceRequest& request_data,
       const SyncLoadResultCallback& sync_result_handler,  // only valid for sync
       int route_id,
       mojom::URLLoaderAssociatedRequest mojo_request,
       mojom::URLLoaderClientAssociatedPtr url_loader_client);
 
   // There are requests which need decisions to be made like the following:
   // Whether the presence of certain HTTP headers like the Origin header are
   // valid, etc. These requests may need to be aborted based on these
   // decisions which could be time consuming. We allow for these decisions
   // to be made asynchronously. The request proceeds when we hear back from
   // the interceptors about whether to continue or not.
   // The |continue_request| parameter in the function indicates whether the
   // request should be continued or aborted. The |error_code| parameter is set
   // if |continue_request| is false.
   void ContinuePendingBeginRequest(
+      scoped_refptr<const ResourceRequesterInfo> requester_info,
       int request_id,
       const ResourceRequest& request_data,
       const SyncLoadResultCallback& sync_result_handler,  // only valid for sync
       int route_id,
       const net::HttpRequestHeaders& headers,
       mojom::URLLoaderAssociatedRequest mojo_request,
       mojom::URLLoaderClientAssociatedPtr url_loader_client,
       bool continue_request,
       int error_code);
 
   // Creates a ResourceHandler to be used by BeginRequest() for normal resource
   // loading.
   std::unique_ptr<ResourceHandler> CreateResourceHandler(
+      const ResourceRequesterInfo* requester_info,
       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,
       ResourceType resource_type,
       ResourceContext* resource_context,
       RequestContextType fetch_request_context_type,
       AppCacheService* appcache_service,
       int child_id,
       int route_id,
       std::unique_ptr<ResourceHandler> handler);
 
-  void OnCancelRequest(int request_id);
-  void OnReleaseDownloadedFile(int request_id);
-  void OnDidChangePriority(int request_id,
+  void OnCancelRequest(const ResourceRequesterInfo* requester_info,
+                       int request_id);
+  void OnReleaseDownloadedFile(const ResourceRequesterInfo* requester_info,
+                               int request_id);
+  void OnDidChangePriority(const ResourceRequesterInfo* requester_info,
+                           int request_id,
                            net::RequestPriority new_priority,
                            int intra_priority_value);
 
   // Creates ResourceRequestInfoImpl for a download or page save.
   // |download| should be true if the request is a file download.
   ResourceRequestInfoImpl* CreateRequestInfo(
       int child_id,
       int render_view_route_id,
       int render_frame_route_id,
       bool download,
@@ skipping 22 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,
+                            const 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 61 matching lines @@
   // The total number of outstanding requests is roughly:
   //   (max_outstanding_requests_cost_per_process_ /
   //       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_;
-
   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_