GTTF: test server cleanup:

chrome/browser/history/redirect_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.
 
 // Navigates the browser to server and client redirect pages and makes sure
 // that the correct redirects are reflected in the history database. Errors
 // here might indicate that WebKit changed the calls our glue layer gets in
 // the case of redirects. It may also mean problems with the history system.
 
 #include "base/file_util.h"
 #include "base/platform_thread.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/string16.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"
 
 namespace {
 
 const wchar_t kDocRoot[] = L"chrome/test/data";
 
 typedef UITest RedirectTest;
 
 // Tests a single server redirect
 TEST_F(RedirectTest, Server) {
-  scoped_refptr<HTTPTestServer> server =
-    HTTPTestServer::CreateServer(kDocRoot, NULL);
+  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_TRUE(NULL != server.get());
 
   GURL final_url = server->TestServerPage(std::string());
   GURL first_url = server->TestServerPage(
       "server-redirect?" + final_url.spec());
 
   NavigateToURL(first_url);
 
   scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
   ASSERT_TRUE(tab_proxy.get());
 
   std::vector<GURL> redirects;
   ASSERT_TRUE(tab_proxy->GetRedirectsFrom(first_url, &redirects));
 
   ASSERT_EQ(1U, redirects.size());
   EXPECT_EQ(final_url.spec(), redirects[0].spec());
 }
 
 // Tests a single client redirect.
 TEST_F(RedirectTest, Client) {
-  scoped_refptr<HTTPTestServer> server =
-    HTTPTestServer::CreateServer(kDocRoot, NULL);
+  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_TRUE(NULL != server.get());
 
   GURL final_url = server->TestServerPage(std::string());
   GURL first_url = server->TestServerPage(
       "client-redirect?" + final_url.spec());
 
   // The client redirect appears as two page visits in the browser.
   NavigateToURLBlockUntilNavigationsComplete(first_url, 2);
 
   scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
@@ skipping 12 matching lines @@
 
   // Navigate one more time.
   NavigateToURLBlockUntilNavigationsComplete(first_url, 2);
 
   // The address bar should still display the final URL.
   EXPECT_TRUE(tab_proxy->GetCurrentURL(&tab_url));
   EXPECT_TRUE(final_url == tab_url);
 }
 
 TEST_F(RedirectTest, ClientEmptyReferer) {
-  scoped_refptr<HTTPTestServer> server =
-    HTTPTestServer::CreateServer(kDocRoot, NULL);
+  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_TRUE(NULL != server.get());
 
   GURL final_url = server->TestServerPage(std::string());
   FilePath test_file(test_data_directory_);
   test_file = test_file.AppendASCII("file_client_redirect.html");
   GURL first_url = net::FilePathToFileURL(test_file);
 
   // The client redirect appears as two page visits in the browser.
   NavigateToURLBlockUntilNavigationsComplete(first_url, 2);
 
@@ skipping 38 matching lines @@
   ASSERT_TRUE(net::FileURLToFilePath(current_url, &current_path));
   ASSERT_TRUE(file_util::AbsolutePath(&current_path));
   // Path should remain unchanged.
   EXPECT_EQ(StringToLowerASCII(first_path.value()),
             StringToLowerASCII(current_path.value()));
   EXPECT_EQ(final_ref, current_url.ref());
 }
 
 // Tests a client->server->server redirect
 TEST_F(RedirectTest, ClientServerServer) {
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot, NULL);
+  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_TRUE(NULL != server.get());
 
   GURL final_url = server->TestServerPage(std::string());
   GURL next_to_last = server->TestServerPage(
       "server-redirect?" + final_url.spec());
   GURL second_url = server->TestServerPage(
       "server-redirect?" + next_to_last.spec());
   GURL first_url = server->TestServerPage(
       "client-redirect?" + second_url.spec());
   std::vector<GURL> redirects;
@@ skipping 12 matching lines @@
   }
 
   ASSERT_EQ(3U, redirects.size());
   EXPECT_EQ(second_url.spec(), redirects[0].spec());
   EXPECT_EQ(next_to_last.spec(), redirects[1].spec());
   EXPECT_EQ(final_url.spec(), redirects[2].spec());
 }
 
 // Tests that the "#reference" gets preserved across server redirects.
 TEST_F(RedirectTest, ServerReference) {
-  scoped_refptr<HTTPTestServer> server =
-    HTTPTestServer::CreateServer(kDocRoot, NULL);
+  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_TRUE(NULL != server.get());
 
   const std::string ref("reference");
 
   GURL final_url = server->TestServerPage(std::string());
   GURL initial_url = server->TestServerPage(
       "server-redirect?" + final_url.spec() + "#" + ref);
 
   NavigateToURL(initial_url);
 
   GURL url = GetActiveTabURL();
   EXPECT_EQ(ref, url.ref());
 }
 
 // Test that redirect from http:// to file:// :
 // A) does not crash the browser or confuse the redirect chain, see bug 1080873
 // B) does not take place.
 TEST_F(RedirectTest, NoHttpToFile) {
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot, NULL);
+  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_TRUE(NULL != server.get());
   FilePath test_file(test_data_directory_);
   test_file = test_file.AppendASCII("http_to_file.html");
   GURL file_url = net::FilePathToFileURL(test_file);
 
   GURL initial_url = server->TestServerPage(
       "client-redirect?" + file_url.spec());
 
   NavigateToURL(initial_url);
   // UITest will check for crashes. We make sure the title doesn't match the
   // title from the file, because the nav should not have taken place.
   scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
   ASSERT_TRUE(tab_proxy.get());
   std::wstring actual_title;
   ASSERT_TRUE(tab_proxy->GetTabTitle(&actual_title));
   EXPECT_NE("File!", WideToUTF8(actual_title));
 }
 
 // Ensures that non-user initiated location changes (within page) are
 // flagged as client redirects. See bug 1139823.
 TEST_F(RedirectTest, ClientFragments) {
-  scoped_refptr<HTTPTestServer> server =
-    HTTPTestServer::CreateServer(kDocRoot, NULL);
+  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_TRUE(NULL != server.get());
 
   FilePath test_file(test_data_directory_);
   test_file = test_file.AppendASCII("ref_redirect.html");
   GURL first_url = net::FilePathToFileURL(test_file);
   std::vector<GURL> redirects;
 
   NavigateToURL(first_url);
 
   scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
@@ skipping 12 matching lines @@
 // we can do this at test-case-level granularity at the moment.
 // http://crbug.com/45056
 TEST_F(RedirectTest,
        DISABLED_ClientCancelledByNewNavigationAfterProvisionalLoad) {
   // We want to initiate a second navigation after the provisional load for
   // the client redirect destination has started, but before this load is
   // committed. To achieve this, we tell the browser to load a slow page,
   // which causes it to start a provisional load, and while it is waiting
   // for the response (which means it hasn't committed the load for the client
   // redirect destination page yet), we issue a new navigation request.
-  scoped_refptr<HTTPTestServer> server =
-    HTTPTestServer::CreateServer(kDocRoot, NULL);
+  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_TRUE(NULL != server.get());
 
   GURL final_url = server->TestServerPage("files/title2.html");
   GURL slow = server->TestServerPage("slow?60");
   GURL first_url = server->TestServerPage(
       "client-redirect?" + slow.spec());
   std::vector<GURL> redirects;
 
   NavigateToURL(first_url);
   // We don't sleep here - the first navigation won't have been committed yet
@@ skipping 27 matching lines @@
        it != redirects.end(); ++it) {
     if (final_url.spec() == it->spec()) {
       final_navigation_not_redirect = false;
       break;
     }
   }
   EXPECT_TRUE(final_navigation_not_redirect);
 }
 
 }  // namespace