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

chrome/browser/chrome_switches_browsertest.cc

Index: chrome/browser/chrome_switches_browsertest.cc
diff --git a/chrome/browser/chrome_switches_browsertest.cc b/chrome/browser/chrome_switches_browsertest.cc
index c936004b26b441d345e62fba52396e5c86690308..872e2d818eae134863b9981cc6beaca4cea26727 100644
--- a/chrome/browser/chrome_switches_browsertest.cc
+++ b/chrome/browser/chrome_switches_browsertest.cc
@@ -10,18 +10,18 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
-#include "net/test/spawned_test_server/spawned_test_server.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 
 class HostRulesTest : public InProcessBrowserTest {
  protected:
   HostRulesTest() {}
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
-    ASSERT_TRUE(test_server()->Start());
+    ASSERT_TRUE(embedded_test_server()->Start());
 
     // Map all hosts to our local server.
-    std::string host_rule(
-        "MAP * " + test_server()->host_port_pair().ToString());
+    std::string host_rule("MAP * " +
+                          embedded_test_server()->host_port_pair().ToString());
     command_line->AppendSwitchASCII(switches::kHostRules, host_rule);
     // Use no proxy or otherwise this test will fail on a machine that has a
     // proxy configured.
@@ -34,7 +34,7 @@ class HostRulesTest : public InProcessBrowserTest {
 
 IN_PROC_BROWSER_TEST_F(HostRulesTest, TestMap) {
   // Go to the empty page using www.google.com as the host.
-  GURL local_url = test_server()->GetURL("files/empty.html");
+  GURL local_url = embedded_test_server()->GetURL("/empty.html");
   GURL test_url(std::string("http://www.google.com") + local_url.path());
   ui_test_utils::NavigateToURL(browser(), test_url);