Extend the ToRenderFrameHost magic to FrameTreeNode* and Shell*

content/child/site_isolation_stats_gatherer_browsertest.cc

 // Copyright 2015 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/macros.h"
 #include "base/strings/pattern.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/histogram_tester.h"
@@ skipping 132 matching lines @@
       "valid.xml",
       "xml.txt",
   };
 
   for (const char* resource : blocked_resources) {
     SCOPED_TRACE(base::StringPrintf("... while testing page: %s", resource));
     base::HistogramTester histograms;
 
     bool was_blocked;
     ASSERT_TRUE(ExecuteScriptAndExtractBool(
-        shell()->web_contents(),
-        base::StringPrintf("sendRequest(\"%s\");", resource), &was_blocked));
+        shell(), base::StringPrintf("sendRequest(\"%s\");", resource),
+        &was_blocked));
     ASSERT_FALSE(was_blocked);
 
     InspectHistograms(histograms, true, resource);
   }
 
   // These files should be allowed for XHR under the document blocking policy.
   const char* allowed_resources[] = {"js.html",
                                      "comment_js.html",
                                      "js.xml",
                                      "js.json",
                                      "js.txt",
                                      "img.html",
                                      "img.xml",
                                      "img.json",
                                      "img.txt",
                                      "comment_js.html"};
   for (const char* resource : allowed_resources) {
     SCOPED_TRACE(base::StringPrintf("... while testing page: %s", resource));
     base::HistogramTester histograms;
 
     bool was_blocked;
     ASSERT_TRUE(ExecuteScriptAndExtractBool(
-        shell()->web_contents(),
-        base::StringPrintf("sendRequest(\"%s\");", resource), &was_blocked));
+        shell(), base::StringPrintf("sendRequest(\"%s\");", resource),
+        &was_blocked));
     ASSERT_FALSE(was_blocked);
 
     InspectHistograms(histograms, false, resource);
   }
 }
 
 IN_PROC_BROWSER_TEST_F(SiteIsolationStatsGathererBrowserTest,
                        CrossSiteDocumentBlockingForDifferentTargets) {
   // This webpage loads a cross-site HTML page in different targets such as
   // <img>,<link>,<embed>, etc. Since the requested document is blocked, and one
   // character string (' ') is returned instead, this tests that the renderer
   // does not crash even when it receives a response body which is " ", whose
   // length is different from what's described in "content-length" for such
   // different targets.
 
   // TODO(nick): Split up these cases, and add positive assertions here about
   // what actually happens in these various resource-block cases.
   GURL foo("http://foo.com/cross_site_document_request_target.html");
   NavigateToURL(shell(), foo);
 }
 
 }  // namespace content