Extend the ToRenderFrameHost magic to FrameTreeNode* and Shell*

content/browser/resource_loading_browsertest.cc

Index: content/browser/resource_loading_browsertest.cc
diff --git a/content/browser/resource_loading_browsertest.cc b/content/browser/resource_loading_browsertest.cc
index c68d577c958d3a3d0f6c27d8f1a7e5675b47498f..b245ac167172e0a91ecc1756ec616e5e23ab0dfc 100644
--- a/content/browser/resource_loading_browsertest.cc
+++ b/content/browser/resource_loading_browsertest.cc
@@ -24,8 +24,8 @@ IN_PROC_BROWSER_TEST_F(ResourceLoadingBrowserTest,
   GURL url = embedded_test_server()->GetURL(kResourceLoadingNonMobilePage);
   NavigateToURL(shell(), url);
   int data = -1;
-  EXPECT_TRUE(ExecuteScriptAndExtractInt(shell()->web_contents(),
-    "getResourceNumber()", &data));
+  EXPECT_TRUE(
+      ExecuteScriptAndExtractInt(shell(), "getResourceNumber()", &data));
   EXPECT_EQ(2, data);
 }