Extend the ToRenderFrameHost magic to FrameTreeNode* and Shell*

content/browser/devtools/protocol/devtools_protocol_browsertest.cc

 // Copyright 2013 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 <stddef.h>
 #include <utility>
 
 #include "base/base64.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
@@ skipping 297 matching lines @@
 
 #if defined(OS_ANDROID)
 // Disabled, see http://crbug.com/469947.
 IN_PROC_BROWSER_TEST_F(DevToolsProtocolTest, DISABLED_SynthesizePinchGesture) {
   GURL test_url = GetTestUrl("devtools", "synthetic_gesture_tests.html");
   NavigateToURLBlockUntilNavigationsComplete(shell(), test_url, 1);
   Attach();
 
   int old_width;
   ASSERT_TRUE(content::ExecuteScriptAndExtractInt(
-      shell()->web_contents(),
-      "domAutomationController.send(window.innerWidth)", &old_width));
+      shell(), "domAutomationController.send(window.innerWidth)", &old_width));
 
   int old_height;
   ASSERT_TRUE(content::ExecuteScriptAndExtractInt(
-      shell()->web_contents(),
-      "domAutomationController.send(window.innerHeight)", &old_height));
+      shell(), "domAutomationController.send(window.innerHeight)",
+      &old_height));
 
   std::unique_ptr<base::DictionaryValue> params(new base::DictionaryValue());
   params->SetInteger("x", old_width / 2);
   params->SetInteger("y", old_height / 2);
   params->SetDouble("scaleFactor", 2.0);
   SendCommand("Input.synthesizePinchGesture", std::move(params));
 
   int new_width;
   ASSERT_TRUE(content::ExecuteScriptAndExtractInt(
-      shell()->web_contents(),
-      "domAutomationController.send(window.innerWidth)", &new_width));
+      shell(), "domAutomationController.send(window.innerWidth)", &new_width));
   ASSERT_DOUBLE_EQ(2.0, static_cast<double>(old_width) / new_width);
 
   int new_height;
   ASSERT_TRUE(content::ExecuteScriptAndExtractInt(
-      shell()->web_contents(),
-      "domAutomationController.send(window.innerHeight)", &new_height));
+      shell(), "domAutomationController.send(window.innerHeight)",
+      &new_height));
   ASSERT_DOUBLE_EQ(2.0, static_cast<double>(old_height) / new_height);
 }
 
 IN_PROC_BROWSER_TEST_F(DevToolsProtocolTest, DISABLED_SynthesizeScrollGesture) {
   GURL test_url = GetTestUrl("devtools", "synthetic_gesture_tests.html");
   NavigateToURLBlockUntilNavigationsComplete(shell(), test_url, 1);
   Attach();
 
   int scroll_top;
   ASSERT_TRUE(content::ExecuteScriptAndExtractInt(
-      shell()->web_contents(),
-      "domAutomationController.send(document.body.scrollTop)", &scroll_top));
+      shell(), "domAutomationController.send(document.body.scrollTop)",
+      &scroll_top));
   ASSERT_EQ(0, scroll_top);
 
   std::unique_ptr<base::DictionaryValue> params(new base::DictionaryValue());
   params->SetInteger("x", 0);
   params->SetInteger("y", 0);
   params->SetInteger("xDistance", 0);
   params->SetInteger("yDistance", -100);
   SendCommand("Input.synthesizeScrollGesture", std::move(params));
 
   ASSERT_TRUE(content::ExecuteScriptAndExtractInt(
-      shell()->web_contents(),
-      "domAutomationController.send(document.body.scrollTop)", &scroll_top));
+      shell(), "domAutomationController.send(document.body.scrollTop)",
+      &scroll_top));
   ASSERT_EQ(100, scroll_top);
 }
 
 IN_PROC_BROWSER_TEST_F(DevToolsProtocolTest, DISABLED_SynthesizeTapGesture) {
   GURL test_url = GetTestUrl("devtools", "synthetic_gesture_tests.html");
   NavigateToURLBlockUntilNavigationsComplete(shell(), test_url, 1);
   Attach();
 
   int scroll_top;
   ASSERT_TRUE(content::ExecuteScriptAndExtractInt(
-      shell()->web_contents(),
-      "domAutomationController.send(document.body.scrollTop)", &scroll_top));
+      shell(), "domAutomationController.send(document.body.scrollTop)",
+      &scroll_top));
   ASSERT_EQ(0, scroll_top);
 
   std::unique_ptr<base::DictionaryValue> params(new base::DictionaryValue());
   params->SetInteger("x", 16);
   params->SetInteger("y", 16);
   params->SetString("gestureSourceType", "touch");
   SendCommand("Input.synthesizeTapGesture", std::move(params));
 
   // The link that we just tapped should take us to the bottom of the page. The
   // new value of |document.body.scrollTop| will depend on the screen dimensions
   // of the device that we're testing on, but in any case it should be greater
   // than 0.
   ASSERT_TRUE(content::ExecuteScriptAndExtractInt(
-      shell()->web_contents(),
-      "domAutomationController.send(document.body.scrollTop)", &scroll_top));
+      shell(), "domAutomationController.send(document.body.scrollTop)",
+      &scroll_top));
   ASSERT_GT(scroll_top, 0);
 }
 #endif  // defined(OS_ANDROID)
 
 IN_PROC_BROWSER_TEST_F(DevToolsProtocolTest, NavigationPreservesMessages) {
   ASSERT_TRUE(embedded_test_server()->Start());
   GURL test_url = embedded_test_server()->GetURL("/devtools/navigation.html");
   NavigateToURLBlockUntilNavigationsComplete(shell(), test_url, 1);
   Attach();
   SendCommand("Page.enable", nullptr, false);
@@ skipping 59 matching lines @@
   host_resolver()->AddRule("*", "127.0.0.1");
   ASSERT_TRUE(embedded_test_server()->Start());
   content::SetupCrossSiteRedirector(embedded_test_server());
 
   NavigateToURLBlockUntilNavigationsComplete(shell(),
       embedded_test_server()->GetURL("A.com", "/devtools/navigation.html"), 1);
   Attach();
   SendCommand("Debugger.enable", nullptr);
 
   ASSERT_TRUE(content::ExecuteScript(
-      shell()->web_contents(),
+      shell(),
       "window.onbeforeunload = function() { debugger; return null; }"));
 
   shell()->LoadURL(
       embedded_test_server()->GetURL("B.com", "/devtools/navigation.html"));
   WaitForNotification("Debugger.paused");
   TestNavigationObserver observer(shell()->web_contents(), 1);
   SendCommand("Debugger.resume", nullptr);
   observer.Wait();
 }
 
 IN_PROC_BROWSER_TEST_F(DevToolsProtocolTest, InspectDuringFrameSwap) {
   host_resolver()->AddRule("*", "127.0.0.1");
   ASSERT_TRUE(embedded_test_server()->Start());
   content::SetupCrossSiteRedirector(embedded_test_server());
 
   GURL test_url1 =
       embedded_test_server()->GetURL("A.com", "/devtools/navigation.html");
   NavigateToURLBlockUntilNavigationsComplete(shell(), test_url1, 1);
 
   ShellAddedObserver new_shell_observer;
-  EXPECT_TRUE(ExecuteScript(shell()->web_contents(),
-                            "window.open('about:blank','foo');"));
+  EXPECT_TRUE(ExecuteScript(shell(), "window.open('about:blank','foo');"));
   Shell* new_shell = new_shell_observer.GetShell();
   EXPECT_TRUE(new_shell->web_contents()->HasOpener());
 
   agent_host_ = DevToolsAgentHost::GetOrCreateFor(new_shell->web_contents());
   agent_host_->AttachClient(this);
 
   GURL test_url2 =
       embedded_test_server()->GetURL("B.com", "/devtools/navigation.html");
 
   // After this navigation, if the bug exists, the process will crash.
   NavigateToURLBlockUntilNavigationsComplete(new_shell, test_url2, 1);
 
   // Ensure that the A.com process is still alive by executing a script in the
   // original tab.
   //
   // TODO(alexmos, nasko):  A better way to do this is to navigate the original
   // tab to another site, watch for process exit, and check whether there was a
   // crash. However, currently there's no way to wait for process exit
   // regardless of whether it's a crash or not.  RenderProcessHostWatcher
   // should be fixed to support waiting on both WATCH_FOR_PROCESS_EXIT and
   // WATCH_FOR_HOST_DESTRUCTION, and then used here.
   bool success = false;
-  EXPECT_TRUE(ExecuteScriptAndExtractBool(shell()->web_contents(),
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(shell(),
                                           "window.domAutomationController.send("
                                           "    !!window.open('', 'foo'));",
                                           &success));
   EXPECT_TRUE(success);
 
   GURL test_url3 =
       embedded_test_server()->GetURL("A.com", "/devtools/navigation.html");
 
   // After this navigation, if the bug exists, the process will crash.
   NavigateToURLBlockUntilNavigationsComplete(new_shell, test_url3, 1);
 
   // Ensure that the A.com process is still alive by executing a script in the
   // original tab.
   success = false;
-  EXPECT_TRUE(ExecuteScriptAndExtractBool(shell()->web_contents(),
+  EXPECT_TRUE(ExecuteScriptAndExtractBool(shell(),
                                           "window.domAutomationController.send("
                                           "    !!window.open('', 'foo'));",
                                           &success));
   EXPECT_TRUE(success);
 }
 
 IN_PROC_BROWSER_TEST_F(DevToolsProtocolTest, ReloadBlankPage) {
   Shell* window =  Shell::CreateNewWindow(
       shell()->web_contents()->GetBrowserContext(),
       GURL("javascript:x=1"),
@@ skipping 38 matching lines @@
   shell()->web_contents()->SetDelegate(&dialog_manager);
   SendCommand("Page.enable", nullptr, true);
   std::unique_ptr<base::DictionaryValue> params(new base::DictionaryValue());
   params->SetString("expression", "alert('alert')");
   SendCommand("Runtime.evaluate", std::move(params), false);
   WaitForNotification("Page.javascriptDialogOpening");
   dialog_manager.Handle();
 }
 
 }  // namespace content