Extend the ToRenderFrameHost magic to FrameTreeNode* and Shell*

content/browser/web_contents/opened_by_dom_browsertest.cc

 // Copyright 2014 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 "base/command_line.h"
 #include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/test/browser_test_utils.h"
@@ skipping 55 matching lines @@
     web_contents->SetDelegate(old_delegate);
     return close_tracking_delegate.close_contents_called();
   }
 
   Shell* OpenWindowFromJavaScript(Shell* shell, const GURL& url) {
     // Wait for the popup to be created and for it to have navigated.
     ShellAddedObserver new_shell_observer;
     TestNavigationObserver nav_observer(NULL);
     nav_observer.StartWatchingNewWebContents();
     CHECK(ExecuteScript(
-        shell->web_contents(),
-        base::StringPrintf("window.open('%s')", url.spec().c_str())));
+        shell, base::StringPrintf("window.open('%s')", url.spec().c_str())));
     nav_observer.Wait();
     return new_shell_observer.GetShell();
   }
 };
 
 // Tests that window.close() does not work on a normal window that has navigated
 // a few times.
 IN_PROC_BROWSER_TEST_F(OpenedByDOMTest, NormalWindow) {
   ASSERT_TRUE(embedded_test_server()->Start());
 
@@ skipping 41 matching lines @@
   url3 = url3.ReplaceComponents(replace_host);
 
   NavigateToURL(shell(), url1);
 
   Shell* popup = OpenWindowFromJavaScript(shell(), url2);
   NavigateToURL(popup, url3);
   EXPECT_TRUE(AttemptCloseFromJavaScript(popup->web_contents()));
 }
 
 }  // namespace content