Extend the ToRenderFrameHost magic to FrameTreeNode* and Shell*

content/browser/browser_side_navigation_browsertest.cc

 // Copyright 2014 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 <stdint.h>
 
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/web_contents/web_contents_impl.h"
@@ skipping 88 matching lines @@
   RenderFrameHost* initial_rfh =
       static_cast<WebContentsImpl*>(shell()->web_contents())
           ->GetFrameTree()->root()->current_frame_host();
 
   // Simulate clicking on a same-site link.
   {
     TestNavigationObserver observer(shell()->web_contents());
     GURL url(embedded_test_server()->GetURL("/title2.html"));
     bool success = false;
     EXPECT_TRUE(ExecuteScriptAndExtractBool(
-        shell()->web_contents(),
-        "window.domAutomationController.send(clickSameSiteLink());", &success));
+        shell(), "window.domAutomationController.send(clickSameSiteLink());",
+        &success));
     EXPECT_TRUE(success);
     EXPECT_TRUE(WaitForLoadStop(shell()->web_contents()));
     EXPECT_EQ(url, observer.last_navigation_url());
     EXPECT_TRUE(observer.last_navigation_succeeded());
   }
 
   // The RenderFrameHost should not have changed.
   EXPECT_EQ(initial_rfh, static_cast<WebContentsImpl*>(shell()->web_contents())
                              ->GetFrameTree()->root()->current_frame_host());
 }
@@ skipping 17 matching lines @@
 
   // Simulate clicking on a cross-site link.
   {
     TestNavigationObserver observer(shell()->web_contents());
     const char kReplacePortNumber[] =
       "window.domAutomationController.send(setPortNumber(%d));";
     uint16_t port_number = embedded_test_server()->port();
     GURL url = embedded_test_server()->GetURL("foo.com", "/title2.html");
     bool success = false;
     EXPECT_TRUE(ExecuteScriptAndExtractBool(
-        shell()->web_contents(),
-        base::StringPrintf(kReplacePortNumber, port_number),
+        shell(), base::StringPrintf(kReplacePortNumber, port_number),
         &success));
     success = false;
     EXPECT_TRUE(ExecuteScriptAndExtractBool(
-        shell()->web_contents(),
-        "window.domAutomationController.send(clickCrossSiteLink());",
+        shell(), "window.domAutomationController.send(clickCrossSiteLink());",
         &success));
     EXPECT_TRUE(success);
     EXPECT_TRUE(WaitForLoadStop(shell()->web_contents()));
     EXPECT_EQ(url, observer.last_navigation_url());
     EXPECT_TRUE(observer.last_navigation_succeeded());
   }
 
   // The RenderFrameHost should not have changed unless site-per-process is
   // enabled.
   if (AreAllSitesIsolatedForTesting()) {
@@ skipping 102 matching lines @@
   // Original page shouldn't navigate away.
   EXPECT_EQ(kUrl, shell()->web_contents()->GetURL());
   EXPECT_FALSE(shell()
                    ->web_contents()
                    ->GetController()
                    .GetLastCommittedEntry()
                    ->IsViewSourceMode());
 }
 
 }  // namespace content