Revert of Revert of [site isolation] cross-site transfers should track the RenderFrameHost

content/browser/loader/cross_site_resource_handler.cc

 // 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.
 
 #include "content/browser/loader/cross_site_resource_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 182 matching lines @@
   // cross-site navigations. This is skipped if a transfer is already required
   // or for WebUI processes for now, since pages like the NTP host multiple
   // cross-site WebUI iframes.
   if (!should_transfer &&
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kSitePerProcess) &&
       !ChildProcessSecurityPolicyImpl::GetInstance()->HasWebUIBindings(
           info->GetChildID())) {
     return DeferForNavigationPolicyCheck(info, response, defer);
   }
 
-  bool swap_needed = should_transfer ||
-      CrossSiteRequestManager::GetInstance()->
-          HasPendingCrossSiteRequest(info->GetChildID(), info->GetRouteID());
+  bool swap_needed =
+      should_transfer ||
+      CrossSiteRequestManager::GetInstance()->HasPendingCrossSiteRequest(
+          info->GetChildID(), info->GetRenderFrameID());
 
   // If this is a download, just pass the response through without doing a
   // cross-site check.  The renderer will see it is a download and abort the
   // request.
   //
   // Similarly, HTTP 204 (No Content) responses leave us showing the previous
   // page.  We should allow the navigation to finish without running the unload
   // handler or swapping in the pending RenderFrameHost.
   //
   // In both cases, any pending RenderFrameHost (if one was created for this
@@ skipping 69 matching lines @@
     const std::string& security_info,
     bool* defer) {
   if (!in_cross_site_transition_) {
     ResourceRequestInfoImpl* info = GetRequestInfo();
     // If we've already completed the transition, or we're canceling the
     // request, or an error occurred with no cross-process navigation in
     // progress, then we should just pass this through.
     if (has_started_response_ ||
         status.status() != net::URLRequestStatus::FAILED ||
         !CrossSiteRequestManager::GetInstance()->HasPendingCrossSiteRequest(
-            info->GetChildID(), info->GetRouteID())) {
+            info->GetChildID(), info->GetRenderFrameID())) {
       next_handler_->OnResponseCompleted(status, security_info, defer);
       return;
     }
 
     // An error occurred. We should wait now for the cross-process transition,
     // so that the error message (e.g., 404) can be displayed to the user.
     // Also continue with the logic below to remember that we completed
     // during the cross-site transition.
     StartCrossSiteTransition(NULL, false);
   }
@@ skipping 135 matching lines @@
     controller()->Resume();
   }
 }
 
 void CrossSiteResourceHandler::OnDidDefer() {
   did_defer_ = true;
   request()->LogBlockedBy("CrossSiteResourceHandler");
 }
 
 }  // namespace content