Extend the ToRenderFrameHost magic to FrameTreeNode* and Shell*

content/browser/net_info_browsertest.cc

Index: content/browser/net_info_browsertest.cc
diff --git a/content/browser/net_info_browsertest.cc b/content/browser/net_info_browsertest.cc
index 5a845561db2606bb9be020f571f31a5b40602089..ba66337c6d943e5d5bb395e351d4d2224d610426 100644
--- a/content/browser/net_info_browsertest.cc
+++ b/content/browser/net_info_browsertest.cc
@@ -58,15 +58,13 @@ class NetInfoBrowserTest : public content::ContentBrowserTest {
 
   std::string RunScriptExtractString(const std::string& script) {
     std::string data;
-    EXPECT_TRUE(
-        ExecuteScriptAndExtractString(shell()->web_contents(), script, &data));
+    EXPECT_TRUE(ExecuteScriptAndExtractString(shell(), script, &data));
     return data;
   }
 
   bool RunScriptExtractBool(const std::string& script) {
     bool data;
-    EXPECT_TRUE(
-        ExecuteScriptAndExtractBool(shell()->web_contents(), script, &data));
+    EXPECT_TRUE(ExecuteScriptAndExtractBool(shell(), script, &data));
     return data;
   }
 
@@ -136,8 +134,7 @@ IN_PROC_BROWSER_TEST_F(NetInfoBrowserTest, TwoRenderViewsInOneProcess) {
   EXPECT_FALSE(RunScriptExtractBool("getOnLine()"));
 
   // Open the same page in a new window on the same process.
-  EXPECT_TRUE(
-      ExecuteScript(shell()->web_contents(), "window.open(\"net_info.html\")"));
+  EXPECT_TRUE(ExecuteScript(shell(), "window.open(\"net_info.html\")"));
 
   // The network state should not have reinitialized to what it was when opening
   // the first window (online).