Removing test_server() and switching over to embedded_test_server.

chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc

Index: chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc
diff --git a/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc b/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc
index d56a7ec3fd6e56937d4de3267263e8aa28a3f963..897e062b5ab9647a61df67c9bd47de98e858d767 100644
--- a/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc
+++ b/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc
@@ -6,7 +6,7 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/page_load_metrics/browser/metrics_web_contents_observer.h"
-#include "net/test/spawned_test_server/spawned_test_server.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 
 namespace page_load_metrics {
 
@@ -22,7 +22,7 @@ class MetricsWebContentsObserverBrowserTest : public InProcessBrowserTest {
 };
 
 IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest, NoNavigation) {
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   histogram_tester_.ExpectTotalCount(kHistogramDomContentLoaded, 0);
   histogram_tester_.ExpectTotalCount(kHistogramLoad, 0);
@@ -30,12 +30,12 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest, NoNavigation) {
 }
 
 IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest, NewPage) {
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   ui_test_utils::NavigateToURL(browser(),
-                               test_server()->GetURL("/title1.html"));
+                               embedded_test_server()->GetURL("/title1.html"));
   ui_test_utils::NavigateToURL(browser(),
-                               test_server()->GetURL("/title2.html"));
+                               embedded_test_server()->GetURL("/title2.html"));
 
   histogram_tester_.ExpectTotalCount(kHistogramDomContentLoaded, 1);
   histogram_tester_.ExpectTotalCount(kHistogramLoad, 1);
@@ -43,14 +43,14 @@ IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest, NewPage) {
 }
 
 IN_PROC_BROWSER_TEST_F(MetricsWebContentsObserverBrowserTest, AnchorLink) {
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   ui_test_utils::NavigateToURL(browser(),
-                               test_server()->GetURL("/title1.html"));
+                               embedded_test_server()->GetURL("/title1.html"));
+  ui_test_utils::NavigateToURL(
+      browser(), embedded_test_server()->GetURL("/title1.html#hash"));
   ui_test_utils::NavigateToURL(browser(),
-                               test_server()->GetURL("/title1.html#hash"));
-  ui_test_utils::NavigateToURL(browser(),
-                               test_server()->GetURL("/title2.html"));
+                               embedded_test_server()->GetURL("/title2.html"));
 
   histogram_tester_.ExpectTotalCount(kHistogramDomContentLoaded, 1);
   histogram_tester_.ExpectTotalCount(kHistogramLoad, 1);