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

chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.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/renderer_host/chrome_resource_dispatcher_host_delegate.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/logging.h"
@@ skipping 451 matching lines @@
   if (throttle)
     throttles->push_back(throttle);
 
   const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
   if (prerender_tracker_->IsPrerenderingOnIOThread(info->GetChildID(),
                                                    info->GetRouteID())) {
     throttles->push_back(new prerender::PrerenderResourceThrottle(
         request, prerender_tracker_));
   }
   if (prerender_tracker_->IsPendingSwapRequestOnIOThread(
-          info->GetChildID(), info->GetRouteID(), request->url())) {
+          info->GetChildID(), info->GetRenderFrameID(), request->url())) {
     throttles->push_back(new prerender::PrerenderPendingSwapThrottle(
         request, prerender_tracker_));
   }
 }
 
 #if defined(ENABLE_ONE_CLICK_SIGNIN)
 void ChromeResourceDispatcherHostDelegate::AppendChromeSyncGaiaHeader(
     net::URLRequest* request,
     content::ResourceContext* resource_context) {
   static const char kAllowChromeSignIn[] = "Allow-Chrome-SignIn";
@@ skipping 144 matching lines @@
   signin::AppendMirrorRequestHeaderIfPossible(request, redirect_url, io_data,
       info->GetChildID(), info->GetRouteID());
 }
 
 // static
 void ChromeResourceDispatcherHostDelegate::
     SetExternalProtocolHandlerDelegateForTesting(
     ExternalProtocolHandler::Delegate* delegate) {
   g_external_protocol_handler_delegate = delegate;
 }