Extend the ToRenderFrameHost magic to FrameTreeNode* and Shell*

content/browser/net_info_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 "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "build/build_config.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
@@ skipping 40 matching lines @@
       net::NetworkChangeNotifier::ConnectionSubtype subtype) {
     net::NetworkChangeNotifier::NotifyObserversOfMaxBandwidthChangeForTests(
         net::NetworkChangeNotifier::GetMaxBandwidthForConnectionSubtype(
             subtype),
         type);
     base::RunLoop().RunUntilIdle();
   }
 
   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;
   }
 
   double RunScriptExtractDouble(const std::string& script) {
     double data = 0.0;
     EXPECT_TRUE(base::StringToDouble(RunScriptExtractString(script), &data));
     return data;
   }
 };
 
@@ skipping 49 matching lines @@
   SetConnectionType(net::NetworkChangeNotifier::CONNECTION_ETHERNET,
                     net::NetworkChangeNotifier::SUBTYPE_GIGABIT_ETHERNET);
   NavigateToURL(shell(), content::GetTestUrl("", "net_info.html"));
   EXPECT_TRUE(RunScriptExtractBool("getOnLine()"));
 
   SetConnectionType(net::NetworkChangeNotifier::CONNECTION_NONE,
                     net::NetworkChangeNotifier::SUBTYPE_NONE);
   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).
   EXPECT_FALSE(RunScriptExtractBool("getOnLine()"));
 }
 
 }  // namespace content