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

chrome/browser/prerender/prerender_observer.h

Index: chrome/browser/prerender/prerender_observer.h
diff --git a/chrome/browser/prerender/prerender_observer.h b/chrome/browser/prerender/prerender_observer.h
index f2ec01822d8bdf2b251375d760e81ca3b48b3bf4..f8ab5f08887f869e89666b64b28e57209da1f45f 100644
--- a/chrome/browser/prerender/prerender_observer.h
+++ b/chrome/browser/prerender/prerender_observer.h
@@ -30,13 +30,15 @@ class PrerenderObserver : public TabContentsObserver {
   virtual ~PrerenderObserver();
 
   // TabContentsObserver implementation.
-  virtual void ProvisionalChangeToMainFrameUrl(const GURL& url) OVERRIDE;
+  virtual void ProvisionalChangeToMainFrameUrl(const GURL& url,
+                                               bool has_opener_set) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void DidStopLoading() OVERRIDE;
 
   // Message handler.
   void OnDidStartProvisionalLoadForFrame(int64 frame_id,
                                          bool main_frame,
+                                         bool has_opener_set,
                                          const GURL& url);
 
  private:
@@ -46,7 +48,7 @@ class PrerenderObserver : public TabContentsObserver {
   // Checks with the PrerenderManager if the specified URL has been preloaded,
   // and if so, swap the RenderViewHost with the preload into this TabContents
   // object.
-  bool MaybeUsePreloadedPage(const GURL& url);
+  bool MaybeUsePreloadedPage(const GURL& url, bool has_opener_set);
 
   // Returns whether the TabContents being observed is currently prerendering.
   bool IsPrerendering();