Revert 7508.7509 and 7510

chrome/browser/printing/printing_layout_uitest.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/gfx/gdi_util.h"
 #include "skia/ext/platform_device.h"
 #include "base/gfx/png_decoder.h"
 #include "base/gfx/png_encoder.h"
@@ skipping 439 matching lines @@
       if (dialog_window) {
         LRESULT res = SendMessage(dialog_window, DM_GETDEFID, 0, 0);
         if (!res)
           return;
         EXPECT_EQ(DC_HASDEFID, HIWORD(res));
         WORD print_button_id = LOWORD(res);
         res = SendMessage(
             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;
 
         // Ok it succeeded.
         dialog_window_ = dialog_window;
         dialog_was_found_ = true;
         return;
       }
       if (!dialog_was_found_)
@@ skipping 20 matching lines @@
 };
 
 }  // namespace
 
 // This test is disable because it fails. See bug 1353559.
 TEST_F(PrintingLayoutTextTest, DISABLED_Complex) {
   if (IsTestCaseDisabled())
     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"));
 }
 
 struct TestPool {
   const wchar_t* source;
   const wchar_t* result;
 };
 
 const TestPool kTestPool[] = {
   // ImagesB&W
   L"files/printing/test2.html", L"test2",
   // ImagesTransparent
   L"files/printing/test3.html", L"test3",
   // ImageColor
   L"files/printing/test4.html", L"test4",
   // TODO(maruel):  http://b/1171450 Transparent overlays are drawn opaque
   // L"files/printing/test5.html", L"test5",
 };
 
 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();
     PrintNowTab();
     EXPECT_EQ(0., CompareWithResult(test.result)) << test.result;
     CleanupDumpDirectory();
     PrintNowTab();
     EXPECT_EQ(0., CompareWithResult(test.result)) << test.result;
     CleanupDumpDirectory();
     PrintNowTab();
     EXPECT_EQ(0., CompareWithResult(test.result)) << test.result;
   }
 }
 
 // Prints a popup and immediately closes it.
 TEST_F(PrintingLayoutTest, DISABLED_Delayed) {
   if (IsTestCaseDisabled())
     return;
   // TODO(maruel):  This test is failing on Windows 2000. I haven't investigated
   // why.
   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));
 
 
     scoped_ptr<base::Thread> worker(
         new base::Thread("PrintingLayoutTest_worker"));
     scoped_refptr<DismissTheWindow> dismiss_task =
         new DismissTheWindow(base::GetProcId(process()));
     // We need to start the thread to be able to set the timer.
     worker->Start();
     worker->message_loop()->PostTask(FROM_HERE,
         NewRunnableMethod(dismiss_task.get(), &DismissTheWindow::Start));
 
     MessageLoop::current()->Run();
 
     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));
   }
   CloseBrowserAndServer();
 
   EXPECT_EQ(0., CompareWithResult(L"popup_delayed_print"))
       << L"popup_delayed_print";
 }
 
 // Prints a popup and immediately closes it.
 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));
 
     scoped_ptr<base::Thread> worker(
         new base::Thread("PrintingLayoutTest_worker"));
     scoped_refptr<DismissTheWindow> dismiss_task =
         new DismissTheWindow(base::GetProcId(process()));
     // We need to start the thread to be able to set the timer.
     worker->Start();
     worker->message_loop()->PostTask(FROM_HERE,
         NewRunnableMethod(dismiss_task.get(), &DismissTheWindow::Start));
 
     MessageLoop::current()->Run();
 
     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));
   }
   CloseBrowserAndServer();
 
   EXPECT_EQ(0., CompareWithResult(L"iframe"))
       << L"iframe";
 }