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

extensions/browser/app_window/app_window_contents.cc

 // Copyright 2013 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.
 
 #include "extensions/browser/app_window/app_window_contents.h"
 
 #include <string>
 #include <utility>
 
 #include "content/public/browser/browser_context.h"
@@ skipping 71 matching lines @@
   content::RenderFrameHost* rfh = web_contents_->GetMainFrame();
   rfh->Send(new ExtensionMsg_MessageInvoke(
       rfh->GetRoutingID(), host_->extension_id(), "app.window",
       "appWindowShownForTests", args, false));
 }
 
 void AppWindowContentsImpl::OnWindowReady() {
   is_window_ready_ = true;
   if (is_blocking_requests_) {
     is_blocking_requests_ = false;
-    content::RenderFrameHost* frame = web_contents_->GetMainFrame();
-    content::BrowserThread::PostTask(
-        content::BrowserThread::IO, FROM_HERE,
-        base::Bind(
-            &content::ResourceDispatcherHost::ResumeBlockedRequestsForRoute,
-            base::Unretained(content::ResourceDispatcherHost::Get()),
-            frame->GetProcess()->GetID(),
-            frame->GetRenderViewHost()->GetRoutingID()));
+    content::ResourceDispatcherHost::ResumeBlockedRequestsForFrameFromUI(

[Devlin, 2016/02/03 21:02:55]

Yay type checking!  I had a bug awhile back that this would have prevented. 
Thanks! :)

+        web_contents_->GetMainFrame());
   }
 }
 
 content::WebContents* AppWindowContentsImpl::GetWebContents() const {
   return web_contents_.get();
 }
 
 WindowController* AppWindowContentsImpl::GetWindowController() const {
   return nullptr;
 }
@@ skipping 19 matching lines @@
   host_->UpdateDraggableRegions(regions);
 }
 
 void AppWindowContentsImpl::SuspendRenderFrameHost(
     content::RenderFrameHost* rfh) {
   DCHECK(rfh);
   // Don't bother blocking requests if the renderer side is already good to go.
   if (is_window_ready_)
     return;
   is_blocking_requests_ = true;
-  // The ResourceDispatcherHost only accepts RenderViewHost child ids.
-  // TODO(devlin): This will need to change for site isolation.
-  content::BrowserThread::PostTask(
-      content::BrowserThread::IO, FROM_HERE,
-      base::Bind(&content::ResourceDispatcherHost::BlockRequestsForRoute,
-                 base::Unretained(content::ResourceDispatcherHost::Get()),
-                 rfh->GetProcess()->GetID(),
-                 rfh->GetRenderViewHost()->GetRoutingID()));
+  content::ResourceDispatcherHost::BlockRequestsForFrameFromUI(rfh);
 }
 
 }  // namespace extensions