Extend the ToRenderFrameHost magic to FrameTreeNode* and Shell*

content/browser/manifest/manifest_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 <utility>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/path_service.h"
@@ skipping 229 matching lines @@
     EXPECT_TRUE(manifest().IsEmpty());
 
     HasManifestAndWait();
     EXPECT_FALSE(has_manifest());
   }
 
   {
     std::string manifest_url =
         GetTestUrl("manifest", "dummy-manifest.json").spec();
     ASSERT_TRUE(content::ExecuteScript(
-        shell()->web_contents(), "setManifestTo('" + manifest_url + "')"));
+        shell(), "setManifestTo('" + manifest_url + "')"));
 
     GetManifestAndWait();
     EXPECT_FALSE(manifest().IsEmpty());
 
     HasManifestAndWait();
     EXPECT_TRUE(has_manifest());
   }
 
   {
     std::string manifest_url =
         GetTestUrl("manifest", "empty-manifest.json").spec();
     ASSERT_TRUE(content::ExecuteScript(
-        shell()->web_contents(), "setManifestTo('" + manifest_url + "')"));
+        shell(), "setManifestTo('" + manifest_url + "')"));
 
     GetManifestAndWait();
     EXPECT_TRUE(manifest().IsEmpty());
 
     HasManifestAndWait();
     EXPECT_TRUE(has_manifest());
   }
 
   EXPECT_EQ(0u, console_error_count());
 }
 
 // If a page's manifest lives in a different origin, it should follow the CORS
 // rules and requesting the manifest should return an empty manifest (unless the
 // response contains CORS headers).
 IN_PROC_BROWSER_TEST_F(ManifestBrowserTest, CORSManifest) {
   ASSERT_TRUE(embedded_test_server()->Start());
   ASSERT_TRUE(cors_embedded_test_server()->Start());
   ASSERT_NE(embedded_test_server()->port(),
             cors_embedded_test_server()->port());
 
   GURL test_url =
       embedded_test_server()->GetURL("/manifest/dynamic-manifest.html");
 
   TestNavigationObserver navigation_observer(shell()->web_contents(), 1);
   shell()->LoadURL(test_url);
   navigation_observer.Wait();
 
   std::string manifest_url = cors_embedded_test_server()->GetURL(
       "/manifest/dummy-manifest.json").spec();
-  ASSERT_TRUE(content::ExecuteScript(shell()->web_contents(),
-                                     "setManifestTo('" + manifest_url + "')"));
+  ASSERT_TRUE(
+      content::ExecuteScript(shell(), "setManifestTo('" + manifest_url + "')"));
 
   GetManifestAndWait();
   EXPECT_TRUE(manifest().IsEmpty());
 
   HasManifestAndWait();
   EXPECT_TRUE(has_manifest());
   EXPECT_EQ(0u, console_error_count());
 
   // The purpose of this second load is to make sure the first load is fully
   // finished. The first load will fail because of Access Control error but the
   // underlying Blink loader will continue fetching the file. There is no
   // reliable way to know when the fetch is finished from the browser test
   // except by fetching the same file from same origin, making it succeed when
   // it is actually fully loaded.
   manifest_url =
       embedded_test_server()->GetURL("/manifest/dummy-manifest.json").spec();
-  ASSERT_TRUE(content::ExecuteScript(shell()->web_contents(),
-                                     "setManifestTo('" + manifest_url + "')"));
+  ASSERT_TRUE(
+      content::ExecuteScript(shell(), "setManifestTo('" + manifest_url + "')"));
   GetManifestAndWait();
 }
 
 // If a page's manifest lives in a different origin, it should be accessible if
 // it has valid access controls headers.
 IN_PROC_BROWSER_TEST_F(ManifestBrowserTest, CORSManifestWithAcessControls) {
   ASSERT_TRUE(embedded_test_server()->Start());
   ASSERT_TRUE(cors_embedded_test_server()->Start());
   ASSERT_NE(embedded_test_server()->port(),
             cors_embedded_test_server()->port());
 
   GURL test_url =
       embedded_test_server()->GetURL("/manifest/dynamic-manifest.html");
 
   TestNavigationObserver navigation_observer(shell()->web_contents(), 1);
   shell()->LoadURL(test_url);
   navigation_observer.Wait();
 
   std::string manifest_url = cors_embedded_test_server()->GetURL(
       "/manifest/manifest-cors.json").spec();
-  ASSERT_TRUE(content::ExecuteScript(shell()->web_contents(),
-                                     "setManifestTo('" + manifest_url + "')"));
+  ASSERT_TRUE(
+      content::ExecuteScript(shell(), "setManifestTo('" + manifest_url + "')"));
 
   GetManifestAndWait();
   EXPECT_FALSE(manifest().IsEmpty());
 
   HasManifestAndWait();
   EXPECT_TRUE(has_manifest());
   EXPECT_EQ(0u, console_error_count());
 }
 
 // If a page's manifest is in an insecure origin while the page is in a secure
 // origin, requesting the manifest should return the empty manifest.
 IN_PROC_BROWSER_TEST_F(ManifestBrowserTest, MixedContentManifest) {
   std::unique_ptr<net::EmbeddedTestServer> https_server(
       new net::EmbeddedTestServer(net::EmbeddedTestServer::TYPE_HTTPS));
   https_server->ServeFilesFromSourceDirectory("content/test/data");
 
   ASSERT_TRUE(embedded_test_server()->Start());
   ASSERT_TRUE(https_server->Start());
 
   GURL test_url =
       embedded_test_server()->GetURL("/manifest/dynamic-manifest.html");
 
   TestNavigationObserver navigation_observer(shell()->web_contents(), 1);
   shell()->LoadURL(test_url);
   navigation_observer.Wait();
 
   std::string manifest_url =
       https_server->GetURL("/manifest/dummy-manifest.json").spec();
-  ASSERT_TRUE(content::ExecuteScript(shell()->web_contents(),
-                                     "setManifestTo('" + manifest_url + "')"));
+  ASSERT_TRUE(
+      content::ExecuteScript(shell(), "setManifestTo('" + manifest_url + "')"));
 
   GetManifestAndWait();
   EXPECT_TRUE(manifest().IsEmpty());
 
   HasManifestAndWait();
   EXPECT_TRUE(has_manifest());
   EXPECT_EQ(0u, console_error_count());
 }
 
 // If a page's manifest has some parsing errors, they should show up in the
@@ skipping 59 matching lines @@
 
   {
     TestNavigationObserver navigation_observer(shell()->web_contents(), 1);
     shell()->LoadURL(test_url);
     navigation_observer.Wait();
   }
 
   {
     TestNavigationObserver navigation_observer(shell()->web_contents(), 1);
     ASSERT_TRUE(content::ExecuteScript(
-        shell()->web_contents(),
-        "history.pushState({foo: \"bar\"}, 'page', 'page.html');"));
+        shell(), "history.pushState({foo: \"bar\"}, 'page', 'page.html');"));
     navigation_observer.Wait();
   }
 
   GetManifestAndWait();
   EXPECT_FALSE(manifest().IsEmpty());
 
   HasManifestAndWait();
   EXPECT_TRUE(has_manifest());
   EXPECT_EQ(0u, console_error_count());
 }
 
 // If a page has a manifest and is navigated using an anchor (ie. same page), it
 // should keep its manifest state.
 IN_PROC_BROWSER_TEST_F(ManifestBrowserTest, AnchorNavigation) {
   ASSERT_TRUE(embedded_test_server()->Start());
   GURL test_url =
       embedded_test_server()->GetURL("/manifest/dummy-manifest.html");
 
   {
     TestNavigationObserver navigation_observer(shell()->web_contents(), 1);
     shell()->LoadURL(test_url);
     navigation_observer.Wait();
   }
 
   {
     TestNavigationObserver navigation_observer(shell()->web_contents(), 1);
     ASSERT_TRUE(content::ExecuteScript(
-        shell()->web_contents(),
+        shell(),
         "var a = document.createElement('a'); a.href='#foo';"
         "document.body.appendChild(a); a.click();"));
     navigation_observer.Wait();
   }
 
   GetManifestAndWait();
   EXPECT_FALSE(manifest().IsEmpty());
   EXPECT_EQ(0u, console_error_count());
 
   HasManifestAndWait();
@@ skipping 116 matching lines @@
   HasManifestAndWait();
   EXPECT_TRUE(has_manifest());
   EXPECT_EQ(0u, console_error_count());
 
   // The custom embedded test server will fill set the name to 'no cookies' if
   // it did not find cookies.
   EXPECT_TRUE(base::EqualsASCII(manifest().name.string(), "no cookies"));
 }
 
 } // namespace content