GTTF: test server cleanup:

chrome/browser/notifications/notifications_interactive_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/file_path.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request_unittest.h"
 
 class NotificationsPermissionTest : public UITest {
  public:
   NotificationsPermissionTest() {
     dom_automation_enabled_ = true;
     show_window_ = true;
   }
 };
 
 TEST_F(NotificationsPermissionTest, TestUserGestureInfobar) {
   const wchar_t kDocRoot[] = L"chrome/test/data";
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot, NULL);
+  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_TRUE(server.get() != NULL);
 
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   scoped_refptr<TabProxy> tab(browser->GetActiveTab());
   ASSERT_TRUE(tab.get());
   ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
             tab->NavigateToURL(server->TestServerPage(
                 "files/notifications/notifications_request_function.html")));
   WaitUntilTabCount(1);
 
   // Request permission by calling request() while eval'ing an inline script;
   // That's considered a user gesture to webkit, and should produce an infobar.
   bool result;
   ASSERT_TRUE(tab->ExecuteAndExtractBool(
       L"",
       L"window.domAutomationController.send(request());",
       &result));
   EXPECT_TRUE(result);
 
   EXPECT_TRUE(tab->WaitForInfoBarCount(1, action_max_timeout_ms()));
 }
 
 TEST_F(NotificationsPermissionTest, TestNoUserGestureInfobar) {
   const wchar_t kDocRoot[] = L"chrome/test/data";
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot, NULL);
+  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_TRUE(server.get() != NULL);
 
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   scoped_refptr<TabProxy> tab(browser->GetActiveTab());
   ASSERT_TRUE(tab.get());
 
   // Load a page which just does a request; no user gesture should result
   // in no infobar.
   ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
             tab->NavigateToURL(server->TestServerPage(
                 "files/notifications/notifications_request_inline.html")));
   WaitUntilTabCount(1);
 
   int info_bar_count;
   ASSERT_TRUE(tab->GetInfoBarCount(&info_bar_count));
   EXPECT_EQ(0, info_bar_count);
 }