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

chrome/browser/do_not_track_browsertest.cc

Index: chrome/browser/do_not_track_browsertest.cc
diff --git a/chrome/browser/do_not_track_browsertest.cc b/chrome/browser/do_not_track_browsertest.cc
index a3eef7aae43b01c8812a81c980785892dc3b5ea3..f06e6c333db56bf1622e045c3a9d1852a5be024d 100644
--- a/chrome/browser/do_not_track_browsertest.cc
+++ b/chrome/browser/do_not_track_browsertest.cc
@@ -13,17 +13,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/embedded_test_server/embedded_test_server.h"
 
 typedef InProcessBrowserTest DoNotTrackTest;
 
 // Check that the DNT header is sent when the corresponding preference is set.
 IN_PROC_BROWSER_TEST_F(DoNotTrackTest, Simple) {
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   PrefService* prefs = browser()->profile()->GetPrefs();
   prefs->SetBoolean(prefs::kEnableDoNotTrack, true);
 
-  GURL url = test_server()->GetURL("echoheader?DNT");
+  GURL url = embedded_test_server()->GetURL("/echoheader?DNT");
   ui_test_utils::NavigateToURL(browser(), url);
 
   int matches = ui_test_utils::FindInPage(
@@ -37,14 +38,14 @@ IN_PROC_BROWSER_TEST_F(DoNotTrackTest, Simple) {
 
 // Check that the DNT header is preserved during redirects.
 IN_PROC_BROWSER_TEST_F(DoNotTrackTest, Redirect) {
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   PrefService* prefs = browser()->profile()->GetPrefs();
   prefs->SetBoolean(prefs::kEnableDoNotTrack, true);
 
-  GURL final_url = test_server()->GetURL("echoheader?DNT");
-  GURL url = test_server()->GetURL(
-      std::string("server-redirect?") + final_url.spec());
+  GURL final_url = embedded_test_server()->GetURL("/echoheader?DNT");
+  GURL url = embedded_test_server()->GetURL(std::string("/server-redirect?") +
+                                            final_url.spec());
   ui_test_utils::NavigateToURL(browser(), url);
 
   int matches = ui_test_utils::FindInPage(