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 83 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 193 matching lines @@
 
   // Cancels pending tasks on deletion.
   ScopedRunnableMethodFactory<PrerenderManager> runnable_method_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PrerenderManager);
 };
 
 }  // namespace prerender
 
 #endif  // CHROME_BROWSER_PRERENDER_PRERENDER_MANAGER_H_