Extend the ToRenderFrameHost magic to FrameTreeNode* and Shell*

content/browser/cross_site_transfer_browsertest.cc

Index: content/browser/cross_site_transfer_browsertest.cc
diff --git a/content/browser/cross_site_transfer_browsertest.cc b/content/browser/cross_site_transfer_browsertest.cc
index 658519c3451954db5fa44b26eafb065b1ad473c8..986cd23297bca49c47fdc7a3ce46e5ce39b7ec16 100644
--- a/content/browser/cross_site_transfer_browsertest.cc
+++ b/content/browser/cross_site_transfer_browsertest.cc
@@ -188,7 +188,7 @@ class CrossSiteTransferTest : public ContentBrowserTest {
     else
       script = base::StringPrintf("location.href = '%s'", url.spec().c_str());
     TestNavigationObserver load_observer(shell()->web_contents(), 1);
-    bool result = ExecuteScript(window->web_contents(), script);
+    bool result = ExecuteScript(window, script);
     EXPECT_TRUE(result);
     if (should_wait_for_navigation)
       load_observer.Wait();