Move chrome/browser/manifest to content/browser.

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 249 matching lines @@
   {
     GetManifestAndWait();
     EXPECT_TRUE(manifest().IsEmpty());
     EXPECT_TRUE(manifest_url().is_empty());
     EXPECT_TRUE(reported_manifest_urls().empty());
   }
 
   {
     std::string manifest_link =
         embedded_test_server()->GetURL("/manifest/dummy-manifest.json").spec();
-    ASSERT_TRUE(content::ExecuteScript(
-        shell(), "setManifestTo('" + manifest_link + "')"));
+    ASSERT_TRUE(
+        ExecuteScript(shell(), "setManifestTo('" + manifest_link + "')"));
 
     GetManifestAndWait();
     EXPECT_FALSE(manifest().IsEmpty());
     EXPECT_FALSE(manifest_url().is_empty());
     expected_manifest_urls.push_back(manifest_url());
     EXPECT_EQ(expected_manifest_urls, reported_manifest_urls());
   }
   {
     std::string manifest_link =
         embedded_test_server()->GetURL("/manifest/empty-manifest.json").spec();
-    ASSERT_TRUE(content::ExecuteScript(
-        shell(), "setManifestTo('" + manifest_link + "')"));
+    ASSERT_TRUE(
+        ExecuteScript(shell(), "setManifestTo('" + manifest_link + "')"));
 
     GetManifestAndWait();
     EXPECT_TRUE(manifest().IsEmpty());
     EXPECT_FALSE(manifest_url().is_empty());
     expected_manifest_urls.push_back(manifest_url());
     EXPECT_EQ(expected_manifest_urls, reported_manifest_urls());
   }
 
   {
-    ASSERT_TRUE(content::ExecuteScript(shell(), "clearManifest()"));
+    ASSERT_TRUE(ExecuteScript(shell(), "clearManifest()"));
 
     GetManifestAndWait();
     EXPECT_TRUE(manifest().IsEmpty());
     EXPECT_TRUE(manifest_url().is_empty());
     expected_manifest_urls.push_back(manifest_url());
     EXPECT_EQ(expected_manifest_urls, reported_manifest_urls());
     ASSERT_EQ(1u, manifests_reported_when_favicon_url_updated().size());
     EXPECT_EQ(0u, manifests_reported_when_favicon_url_updated()[0]);
   }
 
   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(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");
   std::vector<GURL> expected_manifest_urls;
 
   ASSERT_TRUE(NavigateToURL(shell(), test_url));
 
   std::string manifest_link = cors_embedded_test_server()->GetURL(
       "/manifest/dummy-manifest.json").spec();
-  ASSERT_TRUE(content::ExecuteScript(shell(),
-                                     "setManifestTo('" + manifest_link + "')"));
+  ASSERT_TRUE(ExecuteScript(shell(), "setManifestTo('" + manifest_link + "')"));
 
   GetManifestAndWait();
   EXPECT_TRUE(manifest().IsEmpty());
   EXPECT_FALSE(manifest_url().is_empty());
   EXPECT_EQ(0u, console_error_count());
   expected_manifest_urls.push_back(manifest_url());
   EXPECT_EQ(expected_manifest_urls, reported_manifest_urls());
 
   // 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_link =
       embedded_test_server()->GetURL("/manifest/dummy-manifest.json").spec();
-  ASSERT_TRUE(content::ExecuteScript(shell(),
-                                     "setManifestTo('" + manifest_link + "')"));
+  ASSERT_TRUE(ExecuteScript(shell(), "setManifestTo('" + manifest_link + "')"));
   GetManifestAndWait();
   expected_manifest_urls.push_back(manifest_url());
   EXPECT_EQ(expected_manifest_urls, reported_manifest_urls());
   ASSERT_EQ(1u, manifests_reported_when_favicon_url_updated().size());
   EXPECT_EQ(0u, manifests_reported_when_favicon_url_updated()[0]);
 }
 
 // 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(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");
 
   ASSERT_TRUE(NavigateToURL(shell(), test_url));
 
   std::string manifest_link = cors_embedded_test_server()->GetURL(
       "/manifest/manifest-cors.json").spec();
-  ASSERT_TRUE(content::ExecuteScript(shell(),
-                                     "setManifestTo('" + manifest_link + "')"));
+  ASSERT_TRUE(ExecuteScript(shell(), "setManifestTo('" + manifest_link + "')"));
 
   GetManifestAndWait();
   EXPECT_FALSE(manifest().IsEmpty());
   EXPECT_FALSE(manifest_url().is_empty());
   EXPECT_EQ(0u, console_error_count());
   ASSERT_EQ(1u, reported_manifest_urls().size());
   EXPECT_EQ(manifest_url(), reported_manifest_urls()[0]);
   ASSERT_EQ(1u, manifests_reported_when_favicon_url_updated().size());
   EXPECT_EQ(0u, manifests_reported_when_favicon_url_updated()[0]);
 }
 
 // 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(https_server->Start());
 
   GURL test_url =
       embedded_test_server()->GetURL("/manifest/dynamic-manifest.html");
 
   ASSERT_TRUE(NavigateToURL(shell(), test_url));
 
   std::string manifest_link =
       https_server->GetURL("/manifest/dummy-manifest.json").spec();
-  ASSERT_TRUE(content::ExecuteScript(shell(),
-                                     "setManifestTo('" + manifest_link + "')"));
+  ASSERT_TRUE(ExecuteScript(shell(), "setManifestTo('" + manifest_link + "')"));
 
   GetManifestAndWait();
   EXPECT_TRUE(manifest().IsEmpty());
   EXPECT_FALSE(manifest_url().is_empty());
   EXPECT_EQ(0u, console_error_count());
   ASSERT_EQ(1u, reported_manifest_urls().size());
   EXPECT_EQ(manifest_url(), reported_manifest_urls()[0]);
   ASSERT_EQ(1u, manifests_reported_when_favicon_url_updated().size());
   EXPECT_EQ(0u, manifests_reported_when_favicon_url_updated()[0]);
 }
@@ skipping 71 matching lines @@
 // If a page has a manifest and the page is navigated using pushState (ie. same
 // page), it should keep its manifest state.
 IN_PROC_BROWSER_TEST_F(ManifestBrowserTest, PushStateNavigation) {
   GURL test_url =
       embedded_test_server()->GetURL("/manifest/dummy-manifest.html");
 
   ASSERT_TRUE(NavigateToURL(shell(), test_url));
 
   {
     TestNavigationObserver navigation_observer(shell()->web_contents(), 1);
-    ASSERT_TRUE(content::ExecuteScript(
+    ASSERT_TRUE(ExecuteScript(
         shell(), "history.pushState({foo: \"bar\"}, 'page', 'page.html');"));
     navigation_observer.Wait();
   }
 
   GetManifestAndWait();
   EXPECT_FALSE(manifest().IsEmpty());
   EXPECT_FALSE(manifest_url().is_empty());
   EXPECT_EQ(0u, console_error_count());
   ASSERT_EQ(1u, reported_manifest_urls().size());
   EXPECT_EQ(manifest_url(), reported_manifest_urls()[0]);
   ASSERT_EQ(2u, manifests_reported_when_favicon_url_updated().size());
   EXPECT_EQ(1u, manifests_reported_when_favicon_url_updated()[0]);
   EXPECT_EQ(1u, manifests_reported_when_favicon_url_updated()[1]);
 }
 
 // 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) {
   GURL test_url =
       embedded_test_server()->GetURL("/manifest/dummy-manifest.html");
 
   ASSERT_TRUE(NavigateToURL(shell(), test_url));
   {
     TestNavigationObserver navigation_observer(shell()->web_contents(), 1);
-    ASSERT_TRUE(content::ExecuteScript(
-        shell(),
-        "var a = document.createElement('a'); a.href='#foo';"
-        "document.body.appendChild(a); a.click();"));
+    ASSERT_TRUE(
+        ExecuteScript(shell(),
+                      "var a = document.createElement('a'); a.href='#foo';"
+                      "document.body.appendChild(a); a.click();"));
     navigation_observer.Wait();
   }
 
   GetManifestAndWait();
   EXPECT_FALSE(manifest().IsEmpty());
   EXPECT_FALSE(manifest_url().is_empty());
   EXPECT_EQ(0u, console_error_count());
   ASSERT_EQ(1u, reported_manifest_urls().size());
   EXPECT_EQ(manifest_url(), reported_manifest_urls()[0]);
   ASSERT_EQ(2u, manifests_reported_when_favicon_url_updated().size());
@@ skipping 118 matching lines @@
   EXPECT_EQ(manifest_url(), reported_manifest_urls()[0]);
   ASSERT_EQ(1u, manifests_reported_when_favicon_url_updated().size());
   EXPECT_EQ(1u, manifests_reported_when_favicon_url_updated()[0]);
 
   // 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