Migrating tests to use EmbeddedTestServer (/content)

content/browser/web_contents/opened_by_dom_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/strings/stringprintf.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"
@@ skipping 64 matching lines @@
         shell->web_contents(),
         base::StringPrintf("window.open('%s')", url.spec().c_str())));
     nav_observer.Wait();
     return new_shell_observer.GetShell();
   }
 };
 
 // Tests that window.close() does not work on a normal window that has navigated
 // a few times.
 IN_PROC_BROWSER_TEST_F(OpenedByDOMTest, NormalWindow) {
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   // window.close is allowed if the window was opened by DOM OR the back/forward
   // list has only one element. Navigate a bit so the second condition is false.
-  GURL url1 = test_server()->GetURL("files/site_isolation/blank.html?1");
-  GURL url2 = test_server()->GetURL("files/site_isolation/blank.html?2");
+  GURL url1 = embedded_test_server()->GetURL("/site_isolation/blank.html?1");
+  GURL url2 = embedded_test_server()->GetURL("/site_isolation/blank.html?2");
   NavigateToURL(shell(), url1);
   NavigateToURL(shell(), url2);
 
   // This window was not opened by DOM, so close does not reach the browser
   // process.
   EXPECT_FALSE(AttemptCloseFromJavaScript(shell()->web_contents()));
 }
 
 // Tests that window.close() works in a popup window that has navigated a few
 // times.
 IN_PROC_BROWSER_TEST_F(OpenedByDOMTest, Popup) {
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
-  GURL url1 = test_server()->GetURL("files/site_isolation/blank.html?1");
-  GURL url2 = test_server()->GetURL("files/site_isolation/blank.html?2");
-  GURL url3 = test_server()->GetURL("files/site_isolation/blank.html?3");
+  GURL url1 = embedded_test_server()->GetURL("/site_isolation/blank.html?1");
+  GURL url2 = embedded_test_server()->GetURL("/site_isolation/blank.html?2");
+  GURL url3 = embedded_test_server()->GetURL("/site_isolation/blank.html?3");
   NavigateToURL(shell(), url1);
 
   Shell* popup = OpenWindowFromJavaScript(shell(), url2);
   NavigateToURL(popup, url3);
   EXPECT_TRUE(AttemptCloseFromJavaScript(popup->web_contents()));
 }
 
 // Tests that window.close() works in a popup window that has navigated a few
 // times and swapped processes.
 IN_PROC_BROWSER_TEST_F(OpenedByDOMTest, CrossProcessPopup) {
   host_resolver()->AddRule("*", "127.0.0.1");
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
-  GURL url1 = test_server()->GetURL("files/site_isolation/blank.html?1");
+  GURL url1 = embedded_test_server()->GetURL("/site_isolation/blank.html?1");
 
-  GURL url2 = test_server()->GetURL("files/site_isolation/blank.html?2");
+  GURL url2 = embedded_test_server()->GetURL("/site_isolation/blank.html?2");
   GURL::Replacements replace_host;
   replace_host.SetHostStr("foo.com");
   url2 = url2.ReplaceComponents(replace_host);
 
-  GURL url3 = test_server()->GetURL("files/site_isolation/blank.html?3");
+  GURL url3 = embedded_test_server()->GetURL("/site_isolation/blank.html?3");
   url3 = url3.ReplaceComponents(replace_host);
 
   NavigateToURL(shell(), url1);
 
   Shell* popup = OpenWindowFromJavaScript(shell(), url2);
   NavigateToURL(popup, url3);
   EXPECT_TRUE(AttemptCloseFromJavaScript(popup->web_contents()));
 }
 
 }  // namespace content