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

chrome/browser/prerender/prerender_manager.h

 // Copyright (c) 2011 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_
 #pragma once
 
 #include <list>
 #include <map>
@@ skipping 82 matching lines @@
   // Destroy all preloads for the given child route id pair and assign a final
   // status to them.
   void DestroyPreloadForChildRouteIdPair(
       const std::pair<int, int>& child_route_id_pair,
       FinalStatus final_status);
 
   // For a given TabContents that wants to navigate to the URL supplied,
   // 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.
   void MoveEntryToPendingDelete(PrerenderContents* entry);
 
   // Checks if the PrerenderContents has been added to the pending delete list.
   bool IsPendingDelete(PrerenderContents* entry) const;
 
   // Retrieves the PrerenderContents object for the specified URL, if it
   // has been prerendered.  The caller will then have ownership of the
@@ skipping 142 matching lines @@
   base::TimeDelta max_prerender_age_;
   // Maximum amount of memory, in megabytes, that a single PrerenderContents
   // can use before it's cancelled.
   size_t max_prerender_memory_mb_;
   unsigned int max_elements_;
 
   // List of prerendered elements.
   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_;
 
   // Set of TabContents which would be displaying a prerendered page
   // (for the control group).
   base::hash_set<TabContents*> would_be_prerendered_tab_contents_set_;
 
   // Map of child/route id pairs to pending prerender data.
   typedef std::map<std::pair<int, int>, std::vector<PendingContentsData> >
@@ skipping 21 matching lines @@
   base::TimeTicks last_prerender_start_time_;
 
   std::list<TabContentsWrapper*> old_tab_contents_list_;
 
   DISALLOW_COPY_AND_ASSIGN(PrerenderManager);
 };
 
 }  // namespace prerender
 
 #endif  // CHROME_BROWSER_PRERENDER_PRERENDER_MANAGER_H_