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

content/browser/cross_site_request_manager.h

Index: content/browser/cross_site_request_manager.h
diff --git a/content/browser/cross_site_request_manager.h b/content/browser/cross_site_request_manager.h
index 29417d7a8686346e2b9bb05cb8c04dc467238b5d..bf04c8a56557d07819af8357a8e95528ee676221 100644
--- a/content/browser/cross_site_request_manager.h
+++ b/content/browser/cross_site_request_manager.h
@@ -17,7 +17,7 @@
 
 // CrossSiteRequestManager is used to handle bookkeeping for cross-site
 // requests and responses between the UI and IO threads.  Such requests involve
-// a transition from one RenderViewHost to another within WebContentsImpl, and
+// a transition from one RenderFrameHost to another within WebContentsImpl, and
 // involve coordination with ResourceDispatcherHost.
 //
 // CrossSiteRequestManager is a singleton that may be used on any thread.
@@ -27,22 +27,22 @@
   // Returns the singleton instance.
   static CrossSiteRequestManager* GetInstance();
 
-  // Returns whether the RenderViewHost specified by the given IDs currently
+  // Returns whether the RenderFrameHost specified by the given IDs currently
   // has a pending cross-site request.  If so, we will have to delay the
-  // response until the previous RenderViewHost runs its onunload handler.
-  // Called by ResourceDispatcherHost on the IO thread and RenderViewHost on
+  // response until the previous RenderFrameHost runs its onunload handler.
+  // Called by ResourceDispatcherHost on the IO thread and RenderFrameHost on
   // the UI thread.
-  bool HasPendingCrossSiteRequest(int renderer_id, int render_view_id);
+  bool HasPendingCrossSiteRequest(int renderer_id, int render_frame_id);
 
-  // Sets whether the RenderViewHost specified by the given IDs currently has a
-  // pending cross-site request.  Called by RenderViewHost on the UI thread.
+  // Sets whether the RenderFrameHost specified by the given IDs currently has a
+  // pending cross-site request.  Called by RenderFrameHost on the UI thread.
   void SetHasPendingCrossSiteRequest(int renderer_id,
-                                     int render_view_id,
+                                     int render_frame_id,
                                      bool has_pending);
 
  private:
   friend struct DefaultSingletonTraits<CrossSiteRequestManager>;
-  typedef std::set<std::pair<int, int> > RenderViewSet;
+  typedef std::set<std::pair<int, int> > RenderFrameSet;
 
   CrossSiteRequestManager();
   ~CrossSiteRequestManager();
@@ -51,10 +51,10 @@
   // class.  You must not block while holding this lock.
   base::Lock lock_;
 
-  // Set of (render_process_host_id, render_view_id) pairs of all
-  // RenderViewHosts that have pending cross-site requests.  Used to pass
-  // information about the RenderViewHosts between the UI and IO threads.
-  RenderViewSet pending_cross_site_views_;
+  // Set of (render_process_host_id, render_frame_id) pairs of all
+  // RenderFrameHosts that have pending cross-site requests.  Used to pass
+  // information about the RenderFrameHosts between the UI and IO threads.
+  RenderFrameSet pending_cross_site_frames_;
 
   DISALLOW_COPY_AND_ASSIGN(CrossSiteRequestManager);
 };