[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..98abebc7d30ff95861a532468ea71273b006f836 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,14 @@ 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.
+  static void BlockRequestsForFrames(RenderFrameHost* root_frame_host);

[nasko, 2016/02/02 21:26:30]

nit: I find the usage of plural "Frames" a bit confusing when the parameter is
only one object. The comment already states that it recurses into its tree of
subframes, so maybe just drop the plural?

[Charlie Harrison, 2016/02/02 21:44:22]

Sounds good to me. Done (in all places).

+
+  // Resumes any blocked request for the specified root RenderFrameHost and
+  // child frame hosts.
+  static void ResumeBlockedRequestsForFrames(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 +75,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() {}
 };