Extend the ToRenderFrameHost magic to FrameTreeNode* and Shell*

content/browser/top_document_isolation_browsertest.cc

 // Copyright 2016 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 <string>
 
 #include "base/command_line.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/common/content_switches.h"
@@ skipping 37 matching lines @@
 
   void GoBack() {
     TestNavigationObserver back_load_observer(shell()->web_contents());
     shell()->web_contents()->GetController().GoBack();
     back_load_observer.Wait();
   }
 
   Shell* OpenPopup(FrameTreeNode* opener, const std::string& url) {
     GURL gurl =
         opener->current_frame_host()->GetLastCommittedURL().Resolve(url);
-    return content::OpenPopup(opener->current_frame_host(), gurl, "_blank");
+    return content::OpenPopup(opener, gurl, "_blank");
   }
 
   void RendererInitiatedNavigateToURL(FrameTreeNode* node, const GURL& url) {
     TestFrameNavigationObserver nav_observer(node);
-    ASSERT_TRUE(ExecuteScript(node->current_frame_host(),
-                              "window.location.href='" + url.spec() + "'"));
+    ASSERT_TRUE(
+        ExecuteScript(node, "window.location.href='" + url.spec() + "'"));
     nav_observer.Wait();
   }
 
  private:
   FrameTreeVisualizer visualizer_;
 };
 
 IN_PROC_BROWSER_TEST_F(TopDocumentIsolationTest, SameSiteDeeplyNested) {
   if (content::AreAllSitesIsolatedForTesting())
     return;  // Top Document Isolation is disabled in this mode.
@@ skipping 503 matching lines @@
       "      C = http://adnetwork.com/",
       DepictFrameTree(root()));
   EXPECT_EQ(
       " Site C ------------ proxies for B\n"
       "Where B = default subframe process\n"
       "      C = http://adnetwork.com/",
       DepictFrameTree(popup_root));
 }
 
 }  // namespace content