Extend the ToRenderFrameHost magic to FrameTreeNode* and Shell*

content/browser/bookmarklet_browsertest.cc

Index: content/browser/bookmarklet_browsertest.cc
diff --git a/content/browser/bookmarklet_browsertest.cc b/content/browser/bookmarklet_browsertest.cc
index 5ec10d505a581333d6bbcaf7a7480c41a1f2739b..b4ae75ab4d2243544a2146f21b833a1ec18b38df 100644
--- a/content/browser/bookmarklet_browsertest.cc
+++ b/content/browser/bookmarklet_browsertest.cc
@@ -23,7 +23,7 @@ class BookmarkletTest : public ContentBrowserTest {
   std::string GetBodyText() {
     std::string body_text;
     EXPECT_TRUE(ExecuteScriptAndExtractString(
-        shell()->web_contents(),
+        shell(),
         "window.domAutomationController.send(document.body.innerText);",
         &body_text));
     return body_text;