Revert 7508.7509 and 7510

Review URL: http://codereview.chromium.org/17030

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7514 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 22 deletions

diff --git a/chrome/browser/printing/printing_layout_uitest.cc b/chrome/browser/printing/printing_layout_uitest.cc
index 086c2b9..a8c5059 100644
--- a/chrome/browser/printing/printing_layout_uitest.cc
+++ b/chrome/browser/printing/printing_layout_uitest.cc
@@ -457,8 +457,7 @@ class DismissTheWindow : public base::RefCountedThreadSafe<DismissTheWindow> {
             dialog_window,
             WM_COMMAND,
             print_button_id,
-            reinterpret_cast<LPARAM>(GetDlgItem(dialog_window,
-                print_button_id)));
+            reinterpret_cast<LPARAM>(GetDlgItem(dialog_window, print_button_id)));
         // Try again.
         if (res)
           return;
@@ -499,11 +498,8 @@ TEST_F(PrintingLayoutTextTest, DISABLED_Complex) {
     return;
 
   // Print a document, check its output.
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot);
-  ASSERT_TRUE(NULL != server.get());
-
-  NavigateToURL(server->TestServerPage("files/printing/test1.html"));
+  TestServer server(kDocRoot);
+  NavigateToURL(server.TestServerPage("files/printing/test1.html"));
   PrintNowTab();
   EXPECT_EQ(0., CompareWithResult(L"test1"));
 }
@@ -528,16 +524,13 @@ TEST_F(PrintingLayoutTestHidden, ManyTimes) {
   if (IsTestCaseDisabled())
     return;
 
-  scoped_refptr<HTTPTestServer> server =
-    HTTPTestServer::CreateServer(kDocRoot);
-  ASSERT_TRUE(NULL != server.get());
-
+  TestServer server(kDocRoot);
   ASSERT_GT(arraysize(kTestPool), 0u);
   for (int i = 0; i < arraysize(kTestPool); ++i) {
     if (i)
       CleanupDumpDirectory();
     const TestPool& test = kTestPool[i % arraysize(kTestPool)];
-    NavigateToURL(server->TestServerPageW(test.source));
+    NavigateToURL(server.TestServerPageW(test.source));
     PrintNowTab();
     EXPECT_EQ(0., CompareWithResult(test.result)) << test.result;
     CleanupDumpDirectory();
@@ -561,15 +554,13 @@ TEST_F(PrintingLayoutTest, DISABLED_Delayed) {
   if (win_util::GetWinVersion() < win_util::WINVERSION_XP)
     return;
 
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot);
-  ASSERT_TRUE(NULL != server.get());
+  TestServer server(kDocRoot);
 
   {
     scoped_ptr<TabProxy> tab_proxy(GetActiveTab());
     ASSERT_TRUE(tab_proxy.get());
     bool is_timeout = true;
-    GURL url = server->TestServerPage("files/printing/popup_delayed_print.htm");
+    GURL url = server.TestServerPage("files/printing/popup_delayed_print.htm");
     EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
               tab_proxy->NavigateToURL(url));
 
@@ -588,7 +579,7 @@ TEST_F(PrintingLayoutTest, DISABLED_Delayed) {
     worker->Stop();
 
     // Force a navigation elsewhere to verify that it's fine with it.
-    url = server->TestServerPage("files/printing/test1.html");
+    url = server.TestServerPage("files/printing/test1.html");
     EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
               tab_proxy->NavigateToURL(url));
   }
@@ -603,14 +594,12 @@ TEST_F(PrintingLayoutTest, DISABLED_IFrame) {
   if (IsTestCaseDisabled())
     return;
 
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot);
-  ASSERT_TRUE(NULL != server.get());
+  TestServer server(kDocRoot);
 
   {
     scoped_ptr<TabProxy> tab_proxy(GetActiveTab());
     ASSERT_TRUE(tab_proxy.get());
-    GURL url = server->TestServerPage("files/printing/iframe.htm");
+    GURL url = server.TestServerPage("files/printing/iframe.htm");
     EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
               tab_proxy->NavigateToURL(url));
 
@@ -628,7 +617,7 @@ TEST_F(PrintingLayoutTest, DISABLED_IFrame) {
     worker->Stop();
 
     // Force a navigation elsewhere to verify that it's fine with it.
-    url = server->TestServerPage("files/printing/test1.html");
+    url = server.TestServerPage("files/printing/test1.html");
     EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
               tab_proxy->NavigateToURL(url));
   }