Migrating tests to use EmbeddedTestServer (/chrome/browser misc)

chrome/browser/supervised_user/supervised_user_browsertest.cc

Index: chrome/browser/supervised_user/supervised_user_browsertest.cc
diff --git a/chrome/browser/supervised_user/supervised_user_browsertest.cc b/chrome/browser/supervised_user/supervised_user_browsertest.cc
index 53986885e61b8418a43a16c8772d2704eb31a17a..36721cb100234a87872345865f1e2fa06824e02b 100644
--- a/chrome/browser/supervised_user/supervised_user_browsertest.cc
+++ b/chrome/browser/supervised_user/supervised_user_browsertest.cc
@@ -34,6 +34,7 @@
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using content::InterstitialPage;
@@ -116,8 +117,8 @@ class SupervisedUserBlockModeTest : public InProcessBrowserTest {
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     // Enable the test server and remap all URLs to it.
-    ASSERT_TRUE(test_server()->Start());
-    std::string host_port = test_server()->host_port_pair().ToString();
+    ASSERT_TRUE(embedded_test_server()->Start());
+    std::string host_port = embedded_test_server()->host_port_pair().ToString();
     command_line->AppendSwitchASCII(switches::kHostResolverRules,
         "MAP *.example.com " + host_port + "," +
         "MAP *.new-example.com " + host_port + "," +
@@ -175,7 +176,7 @@ class MockTabStripModelObserver : public TabStripModelObserver {
 // Navigates to a blocked URL.
 IN_PROC_BROWSER_TEST_F(SupervisedUserBlockModeTest,
                        SendAccessRequestOnBlockedURL) {
-  GURL test_url("http://www.example.com/files/simple.html");
+  GURL test_url("http://www.example.com/simple.html");
   ui_test_utils::NavigateToURL(browser(), test_url);
 
   WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
@@ -201,7 +202,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserBlockModeTest, OpenBlockedURLInNewTab) {
   WebContents* prev_tab = tab_strip->GetActiveWebContents();
 
   // Open blocked URL in a new tab.
-  GURL test_url("http://www.example.com/files/simple.html");
+  GURL test_url("http://www.example.com/simple.html");
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), test_url, NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
@@ -225,7 +226,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserBlockModeTest, OpenBlockedURLInNewTab) {
 // Tests whether a visit attempt adds a special history entry.
 IN_PROC_BROWSER_TEST_F(SupervisedUserBlockModeTest,
                        HistoryVisitRecorded) {
-  GURL allowed_url("http://www.example.com/files/simple.html");
+  GURL allowed_url("http://www.example.com/simple.html");
 
   scoped_refptr<SupervisedUserURLFilter> filter =
       supervised_user_service_->GetURLFilterForUIThread();
@@ -250,7 +251,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserBlockModeTest,
   CheckShownPageIsNotInterstitial(tab);
 
   // Navigate to a blocked page and go back on the interstitial.
-  GURL blocked_url("http://www.new-example.com/files/simple.html");
+  GURL blocked_url("http://www.new-example.com/simple.html");
   ui_test_utils::NavigateToURL(browser(), blocked_url);
 
   tab = browser()->tab_strip_model()->GetActiveWebContents();
@@ -283,7 +284,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserBlockModeTest,
 }
 
 IN_PROC_BROWSER_TEST_F(SupervisedUserBlockModeTest, Unblock) {
-  GURL test_url("http://www.example.com/files/simple.html");
+  GURL test_url("http://www.example.com/simple.html");
   ui_test_utils::NavigateToURL(browser(), test_url);
 
   WebContents* web_contents =