Track the original opener of a webcontents so we can rely on it for popups

content/browser/frame_host/render_frame_host_manager_browsertest.cc

 // Copyright 2013 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.
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <set>
 
@@ skipping 780 matching lines @@
   NavigateToURL(shell(), frame_url);
 
   // Give the frame an opener using window.open.
   EXPECT_TRUE(ExecuteScript(shell(), "window.open('about:blank','foo');"));
 
   // Check that the browser process updates the subframe's opener.
   FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())
                             ->GetFrameTree()
                             ->root();
   EXPECT_EQ(root, root->child_at(0)->opener());
+  EXPECT_EQ(nullptr, root->child_at(0)->original_opener());
 
   // Now disown the frame's opener.  Shouldn't crash.
   EXPECT_TRUE(ExecuteScript(shell(), "window.frames[0].opener = null;"));
 
   // Check that the subframe's opener in the browser process is disowned.
   EXPECT_EQ(nullptr, root->child_at(0)->opener());
+  EXPECT_EQ(nullptr, root->child_at(0)->original_opener());
 }
 
 // Check that window.name is preserved for top frames when they navigate
 // cross-process.  See https://crbug.com/504164.
 IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
                        PreserveTopFrameWindowNameOnCrossProcessNavigations) {
   StartEmbeddedServer();
 
   GURL main_url(embedded_test_server()->GetURL("/title1.html"));
   EXPECT_TRUE(NavigateToURL(shell(), main_url));
@@ skipping 1449 matching lines @@
   // Initially, both popups' openers should point to main window.
   FrameTreeNode* foo_root =
       static_cast<WebContentsImpl*>(foo_shell->web_contents())
           ->GetFrameTree()
           ->root();
   FrameTreeNode* bar_root =
       static_cast<WebContentsImpl*>(bar_shell->web_contents())
           ->GetFrameTree()
           ->root();
   EXPECT_EQ(root, foo_root->opener());
+  EXPECT_EQ(root, foo_root->original_opener());
   EXPECT_EQ(root, bar_root->opener());
+  EXPECT_EQ(root, bar_root->original_opener());
 
   // From the bar process, use window.open to update foo's opener to point to
   // bar. This is allowed since bar is same-origin with foo's opener.  Use
   // window.open with an empty URL, which should return a reference to the
   // target frame without navigating it.
   bool success = false;
   EXPECT_TRUE(ExecuteScriptAndExtractBool(
       bar_shell,
       "window.domAutomationController.send(!!window.open('','foo'));",
       &success));
   EXPECT_TRUE(success);
   EXPECT_FALSE(foo_shell->web_contents()->IsLoading());
   EXPECT_EQ(foo_url, foo_root->current_url());
 
   // Check that updated opener propagated to the browser process.
   EXPECT_EQ(bar_root, foo_root->opener());
+  EXPECT_EQ(root, foo_root->original_opener());
 
   // Check that foo's opener was updated in foo's process. Send a postMessage
   // to the opener and check that the right window (bar_shell) receives it.
   base::string16 expected_title = ASCIIToUTF16("opener-msg");
   TitleWatcher title_watcher(bar_shell->web_contents(), expected_title);
   success = false;
   EXPECT_TRUE(ExecuteScriptAndExtractBool(
       foo_shell,
       "window.domAutomationController.send(postToOpener('opener-msg', '*'));",
       &success));
   EXPECT_TRUE(success);
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 
   // Check that a non-null assignment to the opener doesn't change the opener
   // in the browser process.
   EXPECT_TRUE(ExecuteScript(foo_shell, "window.opener = window;"));
   EXPECT_EQ(bar_root, foo_root->opener());
+  EXPECT_EQ(root, foo_root->original_opener());
 }
 
 // Tests that when a popup is opened, which is then navigated cross-process and
 // back, it can be still accessed through the original window reference in
 // JavaScript. See https://crbug.com/537657
 IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
                        PopupKeepsWindowReferenceCrossProcesAndBack) {
   StartEmbeddedServer();
 
   // Load a page with links that open in a new window.
@@ skipping 776 matching lines @@
     NavigationEntryImpl* entry = controller.GetLastCommittedEntry();
     ASSERT_EQ(2U, entry->root_node()->children.size());
     EXPECT_EQ(regular_web_url,
               entry->root_node()->children[1]->frame_entry->url());
     EXPECT_NE(root->current_frame_host()->GetSiteInstance(),
               root->child_at(1)->current_frame_host()->GetSiteInstance());
   }
 }
 
 }  // namespace content