Introduce ResourceRequesterInfo to abstract the requester of resource request

content/browser/loader/url_loader_factory_impl.h

Index: content/browser/loader/url_loader_factory_impl.h
diff --git a/content/browser/loader/url_loader_factory_impl.h b/content/browser/loader/url_loader_factory_impl.h
index e989c3d872b7cb1d63d84ce875eb72dfb61212b3..6aa41abb907acf771a64e00734d9f84bca2dfa3a 100644
--- a/content/browser/loader/url_loader_factory_impl.h
+++ b/content/browser/loader/url_loader_factory_impl.h
@@ -12,7 +12,7 @@
 
 namespace content {
 
-class ResourceMessageFilter;
+class ResourceRequesterInfo;
 
 // This class is an implementation of mojom::URLLoaderFactory that creates
 // a mojom::URLLoader.

[kinuko, 2016/11/18 01:29:21]

nit: not really related to this CL but I felt it'd be helpful to have a comment
to note that this is instantiated for SW preload or test cases only

[horo, 2016/11/18 02:02:51]

Done.

@@ -32,29 +32,27 @@ class URLLoaderFactoryImpl final : public mojom::URLLoaderFactory {
                 const SyncLoadCallback& callback) override;
 
   static void CreateLoaderAndStart(
+      const ResourceRequesterInfo* requester_info,
       mojom::URLLoaderAssociatedRequest request,
       int32_t routing_id,
       int32_t request_id,
       const ResourceRequest& url_request,
-      mojom::URLLoaderClientAssociatedPtrInfo client_ptr_info,
-      ResourceMessageFilter* filter);
-  static void SyncLoad(int32_t routing_id,
+      mojom::URLLoaderClientAssociatedPtrInfo client_ptr_info);
+  static void SyncLoad(const ResourceRequesterInfo* requester_info,
+                       int32_t routing_id,
                        int32_t request_id,
                        const ResourceRequest& request,
-                       const SyncLoadCallback& callback,
-                       ResourceMessageFilter* filter);
+                       const SyncLoadCallback& callback);
 
   // Creates a URLLoaderFactoryImpl instance. The instance is held by the
   // StrongBinding in it, so this function doesn't return the instance.
-  CONTENT_EXPORT static void Create(
-      scoped_refptr<ResourceMessageFilter> resource_message_filter,
-      mojom::URLLoaderFactoryRequest request);
+  CONTENT_EXPORT static void Create(const ResourceRequesterInfo* requester_info,
+                                    mojom::URLLoaderFactoryRequest request);
 
  private:
-  explicit URLLoaderFactoryImpl(
-      scoped_refptr<ResourceMessageFilter> resource_message_filter);
+  explicit URLLoaderFactoryImpl(const ResourceRequesterInfo* requester_info);
 
-  scoped_refptr<ResourceMessageFilter> resource_message_filter_;
+  scoped_refptr<const ResourceRequesterInfo> requester_info_;
 
   DISALLOW_COPY_AND_ASSIGN(URLLoaderFactoryImpl);
 };