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

chrome/browser/prerender/prerender_tracker.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_tracker.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prerender/prerender_manager.h"
@@ skipping 100 matching lines @@
     const base::WeakPtr<PrerenderPendingSwapThrottle>& throttle) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   ChildRouteIdPair render_frame_route_id_pair(
       render_process_id, render_frame_id);
   PendingSwapThrottleMap::iterator it =
       pending_swap_throttle_map_.find(render_frame_route_id_pair);
   DCHECK(it != pending_swap_throttle_map_.end());
   if (it == pending_swap_throttle_map_.end())
     return;
-  it->second.throttle = throttle;
+  it->second.throttles.push_back(throttle);
 }
 
 void PrerenderTracker::AddPrerenderOnIOThread(
     const ChildRouteIdPair& child_route_id_pair) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(!IsPrerenderingOnIOThread(child_route_id_pair.first,
                                    child_route_id_pair.second));
 
   resource_throttle_io_thread_map_.insert(
       std::make_pair(child_route_id_pair, ResourceThrottleList()));
@@ skipping 34 matching lines @@
 }
 
 void PrerenderTracker::RemovePrerenderPendingSwapOnIOThread(
     const ChildRouteIdPair& render_frame_route_id_pair,
     bool swap_successful) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   PendingSwapThrottleMap::iterator it =
       pending_swap_throttle_map_.find(render_frame_route_id_pair);
   DCHECK(it != pending_swap_throttle_map_.end());
   // Cancel or resume all throttled resources.
-  if (it->second.throttle) {
+  for (size_t i = 0; i < it->second.throttles.size(); i++) {
+    if (!it->second.throttles[i])
+      continue;
     if (swap_successful)
-      it->second.throttle->Cancel();
+      it->second.throttles[i]->Cancel();
     else
-      it->second.throttle->Resume();
+      it->second.throttles[i]->Resume();
   }
   pending_swap_throttle_map_.erase(render_frame_route_id_pair);
 }
 
 void PrerenderTracker::AddPrerenderPendingSwap(
     const ChildRouteIdPair& render_frame_route_id_pair,
     const GURL& url) {
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&PrerenderTracker::AddPrerenderPendingSwapOnIOThread,
@@ skipping 17 matching lines @@
 
 PrerenderTracker::PendingSwapThrottleData::~PendingSwapThrottleData() {
 }
 
 // static
 PrerenderTracker* PrerenderTracker::GetDefault() {
   return g_browser_process->prerender_tracker();
 }
 
 }  // namespace prerender