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

chrome/browser/prerender/prerender_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_PRERENDER_PRERENDER_MANAGER_H_
 #define CHROME_BROWSER_PRERENDER_PRERENDER_MANAGER_H_
 
 #include <list>
 #include <map>
 #include <string>
@@ skipping 436 matching lines @@
     virtual void ProvisionalChangeToMainFrameUrl(
         const GURL& url,
         content::RenderFrameHost* render_frame_host) OVERRIDE;
     virtual void DidCommitProvisionalLoadForFrame(
         int64 frame_id,
         const base::string16& frame_unique_name,
         bool is_main_frame,
         const GURL& validated_url,
         content::PageTransition transition_type,
         content::RenderViewHost* render_view_host) OVERRIDE;
+    virtual void RenderViewCreated(
+        content::RenderViewHost* render_view_host) OVERRIDE;
     virtual void 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) OVERRIDE;
     virtual void WebContentsDestroyed(content::WebContents* web_contents)
         OVERRIDE;
 
    private:
     void RecordEvent(PrerenderEvent event) const;
 
     void OnMergeCompleted(content::SessionStorageNamespace::MergeResult result);
     void OnMergeTimeout();
 
     // Prerender parameters.
     PrerenderManager* manager_;
     content::WebContents* target_contents_;
     PrerenderData* prerender_data_;
     GURL url_;
     bool should_replace_current_entry_;
 
     base::TimeTicks start_time_;
-    PrerenderTracker::ChildRouteIdPair render_frame_route_id_pair_;
+    std::vector<PrerenderTracker::ChildRouteIdPair> main_rfh_ids_;
     base::OneShotTimer<PendingSwap> merge_timeout_;
     bool swap_successful_;
 
     base::WeakPtrFactory<PendingSwap> weak_factory_;
   };
 
   void SetPrerenderContentsFactory(
       PrerenderContents::Factory* prerender_contents_factory);
 
   // Adds prerenders from the pending Prerenders, called by
@@ skipping 262 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(PrerenderManager);
 };
 
 PrerenderManager* FindPrerenderManagerUsingRenderProcessId(
     int render_process_id);
 
 }  // namespace prerender
 
 #endif  // CHROME_BROWSER_PRERENDER_PRERENDER_MANAGER_H_