GTTF: test server cleanup:

chrome/browser/views/find_bar_host_interactive_uitest.cc

 // Copyright (c) 2010 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/keyboard_codes.h"
 #include "base/message_loop.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/find_bar_controller.h"
@@ skipping 69 matching lines @@
   string16 GetFindBarText() {
     FindBarTesting* find_bar =
         browser()->GetFindBarController()->find_bar()->GetFindBarTesting();
     return find_bar->GetFindText();
   }
 };
 
 }  // namespace
 
 IN_PROC_BROWSER_TEST_F(FindInPageTest, CrashEscHandlers) {
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot, NULL);
+  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_TRUE(NULL != server.get());
 
   // First we navigate to our test page (tab A).
   GURL url = server->TestServerPage(kSimplePage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   browser()->Find();
 
   // Open another tab (tab B).
   browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED, -1,
@@ skipping 16 matching lines @@
 #endif
 
   // This used to crash until bug 1303709 was fixed.
   ui_controls::SendKeyPressNotifyWhenDone(
       browser()->window()->GetNativeHandle(), base::VKEY_ESCAPE,
       false, false, false, false, new MessageLoop::QuitTask());
   ui_test_utils::RunMessageLoop();
 }
 
 IN_PROC_BROWSER_TEST_F(FindInPageTest, FocusRestore) {
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot, NULL);
+  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_TRUE(NULL != server.get());
 
   GURL url = server->TestServerPage("title1.html");
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Focus the location bar, open and close the find-in-page, focus should
   // return to the location bar.
   browser()->FocusLocationBar();
   EXPECT_EQ(VIEW_ID_LOCATION_BAR, GetFocusedViewID());
   // Ensure the creation of the find bar controller.
@@ skipping 87 matching lines @@
   // Press F3 to trigger FindNext.
   ui_controls::SendKeyPressNotifyWhenDone(window, base::VKEY_F3,
       false, false, false, false,  // No modifiers.
       new MessageLoop::QuitTask());
   ui_test_utils::RunMessageLoop();
 
   // After the Find box has been reopened, it should still have no prepopulate
   // value.
   EXPECT_EQ(string16(), GetFindBarText());
 }