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

content/public/browser/resource_dispatcher_host.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.
 
 #ifndef CONTENT_PUBLIC_BROWSER_RESOURCE_DISPATCHER_HOST_H_
 #define CONTENT_PUBLIC_BROWSER_RESOURCE_DISPATCHER_HOST_H_
 
 #include <stdint.h>
 
 #include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/download_interrupt_reasons.h"
 
 namespace net {
 class URLRequest;
 }
 
 namespace content {
 
 class DownloadItem;
 class ResourceContext;
 class ResourceDispatcherHostDelegate;
 struct DownloadSaveInfo;
 struct Referrer;
+class RenderFrameHost;
 
 class CONTENT_EXPORT ResourceDispatcherHost {
  public:
   typedef base::Callback<void(DownloadItem*, DownloadInterruptReason)>
       DownloadStartedCallback;
 
   // 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;
 
   // Controls whether third-party sub-content can pop-up HTTP basic auth
   // dialog boxes.
   virtual void SetAllowCrossOriginAuthPrompt(bool value) = 0;
 
   // Initiates a download by explicit request of the renderer (e.g. due to
   // alt-clicking a link) or some other chrome subsystem.
@@ skipping 15 matching lines @@
       int render_frame_route_id,
       bool prefer_cache,
       bool do_not_prompt_for_login,
       scoped_ptr<DownloadSaveInfo> save_info,
       uint32_t download_id,
       const DownloadStartedCallback& started_callback) = 0;
 
   // 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() {}
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_RESOURCE_DISPATCHER_HOST_H_