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

extensions/browser/app_window/app_window_contents.cc

Index: extensions/browser/app_window/app_window_contents.cc
diff --git a/extensions/browser/app_window/app_window_contents.cc b/extensions/browser/app_window/app_window_contents.cc
index 03629988e967409ab66c987eee21555072a5ffbb..c7f2f9636ea3f0fda65266fda45999768a6d98f7 100644
--- a/extensions/browser/app_window/app_window_contents.cc
+++ b/extensions/browser/app_window/app_window_contents.cc
@@ -93,10 +93,9 @@ void AppWindowContentsImpl::OnWindowReady() {
     content::BrowserThread::PostTask(
         content::BrowserThread::IO, FROM_HERE,
         base::Bind(
-            &content::ResourceDispatcherHost::ResumeBlockedRequestsForRoute,
+            &content::ResourceDispatcherHost::ResumeBlockedRequestsForFrame,
             base::Unretained(content::ResourceDispatcherHost::Get()),
-            frame->GetProcess()->GetID(),
-            frame->GetRenderViewHost()->GetRoutingID()));
+            frame->GetProcess()->GetID(), frame->GetRoutingID()));
   }
 }
 
@@ -136,14 +135,11 @@ void AppWindowContentsImpl::SuspendRenderFrameHost(
   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::Bind(&content::ResourceDispatcherHost::BlockRequestsForFrame,
                  base::Unretained(content::ResourceDispatcherHost::Get()),
-                 rfh->GetProcess()->GetID(),
-                 rfh->GetRenderViewHost()->GetRoutingID()));
+                 rfh->GetProcess()->GetID(), rfh->GetRoutingID()));
 }
 
 }  // namespace extensions