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

content/browser/cross_site_request_manager.cc

Index: content/browser/cross_site_request_manager.cc
diff --git a/content/browser/cross_site_request_manager.cc b/content/browser/cross_site_request_manager.cc
index 2fa38b185ab3769b48274774c3bc6ba951c8fbe3..5ce71bf8f305343b25d2ec2d5e3e27f4936abc44 100644
--- a/content/browser/cross_site_request_manager.cc
+++ b/content/browser/cross_site_request_manager.cc
@@ -9,24 +9,24 @@
 namespace content {
 
 bool CrossSiteRequestManager::HasPendingCrossSiteRequest(int renderer_id,
-                                                         int render_view_id) {
+                                                         int render_frame_id) {
   base::AutoLock lock(lock_);
 
-  std::pair<int, int> key(renderer_id, render_view_id);
-  return pending_cross_site_views_.find(key) !=
-      pending_cross_site_views_.end();
+  std::pair<int, int> key(renderer_id, render_frame_id);
+  return pending_cross_site_frames_.find(key) !=
+         pending_cross_site_frames_.end();
 }
 
 void CrossSiteRequestManager::SetHasPendingCrossSiteRequest(int renderer_id,
-                                                            int render_view_id,
+                                                            int render_frame_id,
                                                             bool has_pending) {
   base::AutoLock lock(lock_);
 
-  std::pair<int, int> key(renderer_id, render_view_id);
+  std::pair<int, int> key(renderer_id, render_frame_id);
   if (has_pending) {
-    pending_cross_site_views_.insert(key);
+    pending_cross_site_frames_.insert(key);
   } else {
-    pending_cross_site_views_.erase(key);
+    pending_cross_site_frames_.erase(key);
   }
 }