GTTF: test server cleanup:

chrome/browser/printing/printing_layout_uitest.cc

 // Copyright (c) 2006-2009 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/simple_thread.h"
 #include "base/test/test_file_util.h"
 #include "base/win_util.h"
 #include "chrome/common/chrome_paths.h"
@@ skipping 274 matching lines @@
 // Fails, see http://crbug.com/7721.
 TEST_F(PrintingLayoutTextTest, FAILS_Complex) {
   if (IsTestCaseDisabled())
     return;
 
   DismissTheWindow dismisser(base::GetProcId(process()));
   base::DelegateSimpleThread close_printdlg_thread(&dismisser,
                                                    "close_printdlg_thread");
 
   // Print a document, check its output.
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot, NULL);
+  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_TRUE(NULL != server.get());
 
   NavigateToURL(server->TestServerPage("files/printing/test1.html"));
   close_printdlg_thread.Start();
   PrintNowTab();
   close_printdlg_thread.Join();
   EXPECT_EQ(0., CompareWithResult(L"test1"));
 }
 
 struct TestPool {
@@ skipping 10 matching lines @@
   "files/printing/test4.html", L"test4",
   // TODO(maruel):  http://b/1171450 Transparent overlays are drawn opaque
   // "files/printing/test5.html", L"test5",
 };
 
 // TODO(maruel:)  http://code.google.com/p/chromium/issues/detail?id=7721
 TEST_F(PrintingLayoutTestHidden, DISABLED_ManyTimes) {
   if (IsTestCaseDisabled())
     return;
 
-  scoped_refptr<HTTPTestServer> server(
-      HTTPTestServer::CreateServer(kDocRoot, NULL));
+  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_TRUE(NULL != server.get());
   DismissTheWindow dismisser(base::GetProcId(process()));
 
   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->TestServerPage(test.source));
     base::DelegateSimpleThread close_printdlg_thread1(&dismisser,
@@ skipping 29 matching lines @@
     EXPECT_EQ(0., CompareWithResult(test.result)) << test.result;
   }
 }
 
 // Prints a popup and immediately closes it.
 // TODO(maruel): Reenable it, it causes crashes.
 TEST_F(PrintingLayoutTest, DISABLED_Delayed) {
   if (IsTestCaseDisabled())
     return;
 
-  scoped_refptr<HTTPTestServer> server(
-      HTTPTestServer::CreateServer(kDocRoot, NULL));
+  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_TRUE(NULL != server.get());
 
   {
     scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
     ASSERT_TRUE(tab_proxy.get());
     bool is_timeout = true;
     GURL url = server->TestServerPage("files/printing/popup_delayed_print.htm");
     EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
               tab_proxy->NavigateToURL(url));
 
@@ skipping 13 matching lines @@
   EXPECT_EQ(0., CompareWithResult(L"popup_delayed_print"))
       << L"popup_delayed_print";
 }
 
 // Prints a popup and immediately closes it.
 // TODO(maruel:)  http://code.google.com/p/chromium/issues/detail?id=7721
 TEST_F(PrintingLayoutTest, DISABLED_IFrame) {
   if (IsTestCaseDisabled())
     return;
 
-  scoped_refptr<HTTPTestServer> server(
-      HTTPTestServer::CreateServer(kDocRoot, NULL));
+  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_TRUE(NULL != server.get());
 
   {
     scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
     ASSERT_TRUE(tab_proxy.get());
     GURL url = server->TestServerPage("files/printing/iframe.htm");
     EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
               tab_proxy->NavigateToURL(url));
 
     DismissTheWindow dismisser(base::GetProcId(process()));
     base::DelegateSimpleThread close_printdlg_thread(&dismisser,
                                                      "close_printdlg_thread");
     close_printdlg_thread.Start();
     close_printdlg_thread.Join();
 
     // Force a navigation elsewhere to verify that it's fine with it.
     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";
 }