Move chrome/browser/manifest to content/browser.

content/browser/manifest/manifest_browsertest.cc

Index: content/browser/manifest/manifest_browsertest.cc
diff --git a/content/browser/manifest/manifest_browsertest.cc b/content/browser/manifest/manifest_browsertest.cc
index 18f378d2b2a03994c055480d94f8088aea094fbe..2ff4299c7a2ced44716893f1e486676f3746b485 100644
--- a/content/browser/manifest/manifest_browsertest.cc
+++ b/content/browser/manifest/manifest_browsertest.cc
@@ -267,8 +267,8 @@ IN_PROC_BROWSER_TEST_F(ManifestBrowserTest, DynamicManifest) {
   {
     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());
@@ -279,8 +279,8 @@ IN_PROC_BROWSER_TEST_F(ManifestBrowserTest, DynamicManifest) {
   {
     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());
@@ -290,7 +290,7 @@ IN_PROC_BROWSER_TEST_F(ManifestBrowserTest, DynamicManifest) {
   }
 
   {
-    ASSERT_TRUE(content::ExecuteScript(shell(), "clearManifest()"));
+    ASSERT_TRUE(ExecuteScript(shell(), "clearManifest()"));
 
     GetManifestAndWait();
     EXPECT_TRUE(manifest().IsEmpty());
@@ -320,8 +320,7 @@ IN_PROC_BROWSER_TEST_F(ManifestBrowserTest, CORSManifest) {
 
   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());
@@ -338,8 +337,7 @@ IN_PROC_BROWSER_TEST_F(ManifestBrowserTest, CORSManifest) {
   // 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());
@@ -361,8 +359,7 @@ IN_PROC_BROWSER_TEST_F(ManifestBrowserTest, CORSManifestWithAcessControls) {
 
   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());
@@ -390,8 +387,7 @@ IN_PROC_BROWSER_TEST_F(ManifestBrowserTest, MixedContentManifest) {
 
   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());
@@ -483,7 +479,7 @@ IN_PROC_BROWSER_TEST_F(ManifestBrowserTest, PushStateNavigation) {
 
   {
     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();
   }
@@ -508,10 +504,10 @@ IN_PROC_BROWSER_TEST_F(ManifestBrowserTest, AnchorNavigation) {
   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();
   }