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

chrome/browser/printing/printing_layout_browsertest.cc

Index: chrome/browser/printing/printing_layout_browsertest.cc
diff --git a/chrome/browser/printing/printing_layout_browsertest.cc b/chrome/browser/printing/printing_layout_browsertest.cc
index 3ab5dff019e3a0498589b8e3f51fdc2066a29e3c..4d64753fe5ec4b2e175c0ea3e219410249314f1b 100644
--- a/chrome/browser/printing/printing_layout_browsertest.cc
+++ b/chrome/browser/printing/printing_layout_browsertest.cc
@@ -26,7 +26,7 @@
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
-#include "net/test/spawned_test_server/spawned_test_server.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 #include "printing/image.h"
 #include "printing/printing_test.h"
 
@@ -339,10 +339,10 @@ IN_PROC_BROWSER_TEST_F(PrintingLayoutTextTest, DISABLED_Complex) {
                                                    "close_printdlg_thread");
 
   // Print a document, check its output.
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   ui_test_utils::NavigateToURL(
-      browser(), test_server()->GetURL("files/printing/test1.html"));
+      browser(), embedded_test_server()->GetURL("/printing/test1.html"));
   close_printdlg_thread.Start();
   PrintNowTab();
   close_printdlg_thread.Join();
@@ -355,12 +355,12 @@ struct TestPool {
 };
 
 const TestPool kTestPool[] = {
-  // ImagesB&W
-  "files/printing/test2.html", L"test2",
-  // ImagesTransparent
-  "files/printing/test3.html", L"test3",
-  // ImageColor
-  "files/printing/test4.html", L"test4",
+    // ImagesB&W
+    "/printing/test2.html", L"test2",
+    // ImagesTransparent
+    "/printing/test3.html", L"test3",
+    // ImageColor
+    "/printing/test4.html", L"test4",
 };
 
 // http://crbug.com/7721
@@ -368,7 +368,7 @@ IN_PROC_BROWSER_TEST_F(PrintingLayoutTest, DISABLED_ManyTimes) {
   if (IsTestCaseDisabled())
     return;
 
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   DismissTheWindow dismisser;
 
@@ -377,7 +377,8 @@ IN_PROC_BROWSER_TEST_F(PrintingLayoutTest, DISABLED_ManyTimes) {
     if (i)
       CleanupDumpDirectory();
     const TestPool& test = kTestPool[i % arraysize(kTestPool)];
-    ui_test_utils::NavigateToURL(browser(), test_server()->GetURL(test.source));
+    ui_test_utils::NavigateToURL(browser(),
+                                 embedded_test_server()->GetURL(test.source));
     base::DelegateSimpleThread close_printdlg_thread1(&dismisser,
                                                       "close_printdlg_thread");
     EXPECT_EQ(NULL, FindDialogWindow(dismisser.owner_process()));
@@ -417,11 +418,12 @@ IN_PROC_BROWSER_TEST_F(PrintingLayoutTest, DISABLED_Delayed) {
   if (IsTestCaseDisabled())
     return;
 
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   {
     bool is_timeout = true;
-    GURL url = test_server()->GetURL("files/printing/popup_delayed_print.htm");
+    GURL url =
+        embedded_test_server()->GetURL("/printing/popup_delayed_print.htm");
     ui_test_utils::NavigateToURL(browser(), url);
 
     DismissTheWindow dismisser;
@@ -431,7 +433,7 @@ IN_PROC_BROWSER_TEST_F(PrintingLayoutTest, DISABLED_Delayed) {
     close_printdlg_thread.Join();
 
     // Force a navigation elsewhere to verify that it's fine with it.
-    url = test_server()->GetURL("files/printing/test1.html");
+    url = embedded_test_server()->GetURL("/printing/test1.html");
     ui_test_utils::NavigateToURL(browser(), url);
   }
   chrome::CloseWindow(browser());
@@ -446,10 +448,10 @@ IN_PROC_BROWSER_TEST_F(PrintingLayoutTest, DISABLED_IFrame) {
   if (IsTestCaseDisabled())
     return;
 
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   {
-    GURL url = test_server()->GetURL("files/printing/iframe.htm");
+    GURL url = embedded_test_server()->GetURL("/printing/iframe.htm");
     ui_test_utils::NavigateToURL(browser(), url);
 
     DismissTheWindow dismisser;
@@ -459,7 +461,7 @@ IN_PROC_BROWSER_TEST_F(PrintingLayoutTest, DISABLED_IFrame) {
     close_printdlg_thread.Join();
 
     // Force a navigation elsewhere to verify that it's fine with it.
-    url = test_server()->GetURL("files/printing/test1.html");
+    url = embedded_test_server()->GetURL("/printing/test1.html");
     ui_test_utils::NavigateToURL(browser(), url);
   }
   chrome::CloseWindow(browser());