Changes to not use the prerendered contents when window.opener needs to be set.

chrome/browser/prerender/prerender_manager.h

Index: chrome/browser/prerender/prerender_manager.h
diff --git a/chrome/browser/prerender/prerender_manager.h b/chrome/browser/prerender/prerender_manager.h
index 7b4f40e859572ef4fa271b44f0d3a6da35522e3d..3095670a16f4133d75241649e11f8f27566c4ea1 100644
--- a/chrome/browser/prerender/prerender_manager.h
+++ b/chrome/browser/prerender/prerender_manager.h
@@ -100,8 +100,12 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>,
   // determines whether a preloaded version of the URL can be used,
   // and substitutes the prerendered RVH into the TabContents.  Returns
   // whether or not a prerendered RVH could be used or not.
-  bool MaybeUsePreloadedPage(TabContents* tab_contents, const GURL& url);
-  bool MaybeUsePreloadedPageOld(TabContents* tab_contents, const GURL& url);
+  bool MaybeUsePreloadedPage(TabContents* tab_contents,
+                             const GURL& url,
+                             bool has_opener_set);
+  bool MaybeUsePreloadedPageOld(TabContents* tab_contents,
+                                const GURL& url,
+                                bool has_opener_set);
 
   // Moves a PrerenderContents to the pending delete list from the list of
   // active prerenders when prerendering should be cancelled.
@@ -264,7 +268,7 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>,
   std::list<PrerenderContentsData> prerender_list_;
 
   // List of prerender elements to be deleted
-  std::list<PrerenderContentsData> pending_delete_list_;
+  std::list<PrerenderContents*> pending_delete_list_;
 
   // Set of TabContents which are currently displaying a prerendered page.
   base::hash_set<TabContents*> prerendered_tab_contents_set_;