[RDHI] Refactored blocked_loaders_map_ to key by render frame route id

content/public/browser/resource_dispatcher_host.h

Index: content/public/browser/resource_dispatcher_host.h
diff --git a/content/public/browser/resource_dispatcher_host.h b/content/public/browser/resource_dispatcher_host.h
index d8b2495f22c91cad91df9daf3784fa42c598cd59..261717dd202e0be2d9af7a8684483827da203046 100644
--- a/content/public/browser/resource_dispatcher_host.h
+++ b/content/public/browser/resource_dispatcher_host.h
@@ -22,6 +22,7 @@ class ResourceContext;
 class ResourceDispatcherHostDelegate;
 struct DownloadSaveInfo;
 struct Referrer;
+class RenderFrameHost;
 
 class CONTENT_EXPORT ResourceDispatcherHost {
  public:
@@ -31,6 +32,15 @@ class CONTENT_EXPORT ResourceDispatcherHost {
   // Returns the singleton instance of the ResourceDispatcherHost.
   static ResourceDispatcherHost* Get();
 
+  // Causes all new requests for the root RenderFrameHost and its children to be
+  // blocked (not being started) until ResumeBlockedRequestsForRoute is called.

[nasko, 2016/02/03 18:44:00]

Shouldn't this be ResumeBlockedRequestsForFrameFromUI? The Route based method is
not public, is it?

[Charlie Harrison, 2016/02/03 19:20:21]

Correct. Done.

+  static void BlockRequestsForFrameFromUI(RenderFrameHost* root_frame_host);

[nasko, 2016/02/03 18:44:00]

Not a huge fan of the extra "FromUI" suffixes as it makes the method less
readable, but if you and Randy feel it should be there, let's go with it. In
general, documentation/comment and DCHECK enforcing the thread should be
sufficient enough.

+
+  // Resumes any blocked request for the specified root RenderFrameHost and
+  // child frame hosts.
+  static void ResumeBlockedRequestsForFrameFromUI(
+      RenderFrameHost* root_frame_host);
+
   // This does not take ownership of the delegate. It is expected that the
   // delegate have a longer lifetime than the ResourceDispatcherHost.
   virtual void SetDelegate(ResourceDispatcherHostDelegate* delegate) = 0;
@@ -66,14 +76,6 @@ class CONTENT_EXPORT ResourceDispatcherHost {
   // Clears the ResourceDispatcherHostLoginDelegate associated with the request.
   virtual void ClearLoginDelegateForRequest(net::URLRequest* request) = 0;
 
-  // Causes all new requests for the route identified by |child_id| and
-  // |route_id| to be blocked (not being started) until
-  // ResumeBlockedRequestsForRoute is called.
-  virtual void BlockRequestsForRoute(int child_id, int route_id) = 0;
-
-  // Resumes any blocked request for the specified route id.
-  virtual void ResumeBlockedRequestsForRoute(int child_id, int route_id) = 0;
-
  protected:
   virtual ~ResourceDispatcherHost() {}
 };