Add back the code to PrerenderManager::PendingSwap to handle RenderViewCreated being called for a...

chrome/browser/prerender/prerender_manager.cc

Index: chrome/browser/prerender/prerender_manager.cc
===================================================================
--- chrome/browser/prerender/prerender_manager.cc	(revision 244941)
+++ chrome/browser/prerender/prerender_manager.cc	(working copy)
@@ -1127,20 +1127,14 @@
       start_time_(base::TimeTicks::Now()),
       swap_successful_(false),
       weak_factory_(this) {
-  // Record the RFH id in the tracker to install throttles on MAIN_FRAME
-  // requests from that route.
-  int render_process_id =
-      target_contents->GetMainFrame()->GetProcess()->GetID();
-  int render_frame_id = target_contents->GetMainFrame()->GetRoutingID();
-  render_frame_route_id_pair_ = PrerenderTracker::ChildRouteIdPair(
-      render_process_id, render_frame_id);
-  manager_->prerender_tracker()->AddPrerenderPendingSwap(
-      render_frame_route_id_pair_, url_);
+  RenderViewCreated(target_contents->GetRenderViewHost());
 }
 
 PrerenderManager::PendingSwap::~PendingSwap() {
-  manager_->prerender_tracker()->RemovePrerenderPendingSwap(
-        render_frame_route_id_pair_, swap_successful_);
+  for (size_t i = 0; i < main_rfh_ids_.size(); i++) {
+    manager_->prerender_tracker()->RemovePrerenderPendingSwap(
+        main_rfh_ids_[i], swap_successful_);
+  }
 }
 
 void PrerenderManager::PendingSwap::BeginSwap() {
@@ -1185,6 +1179,20 @@
   prerender_data_->ClearPendingSwap();
 }
 
+void PrerenderManager::PendingSwap::RenderViewCreated(
+    content::RenderViewHost* render_view_host) {

[davidben, 2014/01/16 18:06:00]

Hrm. So, was the goal of this work to get rid of RenderViewHost altogether or
just remove the IO-thread level state and convert to RenderFrameHost later?
Because this is still using RenderViewHost. (I ask because I'm thinking of doing
a follow-up that switches it to AboutToNavigateRenderView and avoids the
main_rfh_ids_ vector. But I didn't see a RenderFrame version.)

[jam, 2014/01/16 18:12:26]

The latter. Eventually RenderViewCreated will be gone, but I have to work in
many small steps :) The first is removing IO thread usage of RV IDs.

[davidben, 2014/01/16 20:45:38]

Ah, okay. Would it be a problem and/or useful for you then if I switched it to
AboutToNavigateRenderView to avoid the vector?

[jam, 2014/01/16 20:50:35]

np to me, I was just trying to leave things in the same state before my earlier
change after your test showed me that RVCreated can be called twice.

+  // Record the RFH id in the tracker to install throttles on MAIN_FRAME
+  // requests from that route.
+  int render_process_id =
+      render_view_host->GetMainFrame()->GetProcess()->GetID();
+  int render_frame_id = render_view_host->GetMainFrame()->GetRoutingID();
+  PrerenderTracker::ChildRouteIdPair render_frame_route_id_pair(
+      render_process_id, render_frame_id);
+  main_rfh_ids_.push_back(render_frame_route_id_pair);
+  manager_->prerender_tracker()->AddPrerenderPendingSwap(
+      render_frame_route_id_pair, url_);
+}
+
 void PrerenderManager::PendingSwap::DidFailProvisionalLoad(
         int64 frame_id,
         const base::string16& frame_unique_name,