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

chrome/browser/prerender/prerender_manager.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 "chrome/browser/prerender/prerender_manager.h"
 
 #include <algorithm>
 #include <functional>
 #include <string>
 #include <vector>
@@ skipping 1109 matching lines @@
     bool should_replace_current_entry)
     : content::WebContentsObserver(target_contents),
       manager_(manager),
       target_contents_(target_contents),
       prerender_data_(prerender_data),
       url_(url),
       should_replace_current_entry_(should_replace_current_entry),
       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() {
   SessionStorageNamespace* target_namespace =
       target_contents_->GetController().GetDefaultSessionStorageNamespace();
   SessionStorageNamespace* prerender_namespace =
       prerender_data_->contents()->GetSessionStorageNamespace();
 
   prerender_namespace->Merge(
       true, prerender_data_->contents()->child_id(),
@@ skipping 24 matching lines @@
         const base::string16& frame_unique_name,
         bool is_main_frame,
         const GURL& validated_url,
         content::PageTransition transition_type,
         content::RenderViewHost* render_view_host){
   if (!is_main_frame)
     return;
   prerender_data_->ClearPendingSwap();
 }
 
+void PrerenderManager::PendingSwap::RenderViewCreated(
+    content::RenderViewHost* render_view_host) {
+  // 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,
         bool is_main_frame,
         const GURL& validated_url,
         int error_code,
         const base::string16& error_description,
         content::RenderViewHost* render_view_host) {
   if (!is_main_frame)
     return;
@@ skipping 689 matching lines @@
                                         earliest_create_date);
 }
 
 void PrerenderManager::RecordCookieStatus(Origin origin,
                                           uint8 experiment_id,
                                           int cookie_status) const {
   histograms_->RecordCookieStatus(origin, experiment_id, cookie_status);
 }
 
 }  // namespace prerender