Revert 7508.7509 and 7510

chrome/browser/interstitial_page_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 <string>
 
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "net/url_request/url_request_unittest.h"
@@ skipping 34 matching lines @@
 };
 
 }  // namespace
 
 // Shows and hides an interstitial page.
 // Note that we cannot rely on the page title in this case (and we use the page
 // type instead) as showing an interstitial without creating a navigation entry
 // causes the actual navigation entry (title) to be modified by the content of
 // the interstitial.
 TEST_F(InterstitialPageTest, TestShowHideInterstitial) {
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot);
-  ASSERT_TRUE(NULL != server.get());
-
+  TestServer server(kDocRoot);
   ::scoped_ptr<TabProxy> tab(GetActiveTabProxy());
   NavigateTab(tab.get(),
-              server->TestServerPageW(L"files/interstitial_page/google.html"));
+              server.TestServerPageW(L"files/interstitial_page/google.html"));
   NavigationEntry::PageType page_type;
   EXPECT_TRUE(tab->GetPageType(&page_type));
   EXPECT_EQ(NavigationEntry::NORMAL_PAGE, page_type);
 
   tab->ShowInterstitialPage(kInterstitialPageHTMLText, action_timeout_ms());
   EXPECT_TRUE(tab->GetPageType(&page_type));
   EXPECT_EQ(NavigationEntry::INTERSTITIAL_PAGE, page_type);
 
   tab->HideInterstitialPage();
   EXPECT_TRUE(tab->GetPageType(&page_type));
   EXPECT_EQ(NavigationEntry::NORMAL_PAGE, page_type);
 }
 
 // Shows an interstitial page then goes back.
 // TODO(creis): We are disabling this test for now.  We need to revisit
 // whether the interstitial page should actually commit a NavigationEntry,
 // because this clears the forward list and changes the meaning of back.  It
 // seems like the interstitial should not affect the NavigationController,
 // who will remain in a pending state until the user either proceeds or cancels
 // the interstitial.  In the mean time, we are treating Back like cancelling
 // the interstitial, which breaks this test because no notification occurs.
 TEST_F(InterstitialPageTest, DISABLED_TestShowInterstitialThenBack) {
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot);
-  ASSERT_TRUE(NULL != server.get());
-
+  TestServer server(kDocRoot);
   ::scoped_ptr<TabProxy> tab(GetActiveTabProxy());
   NavigateTab(tab.get(),
-              server->TestServerPageW(L"files/interstitial_page/google.html"));
+              server.TestServerPageW(L"files/interstitial_page/google.html"));
   EXPECT_EQ(L"Google", GetActiveTabTitle());
 
   tab->ShowInterstitialPage(kInterstitialPageHTMLText, action_timeout_ms());
   EXPECT_EQ(L"Interstitial page", GetActiveTabTitle());
 
   tab->GoBack();
   EXPECT_EQ(L"Google", GetActiveTabTitle());
 }
 
 // Shows an interstitial page then navigates to a new URL.
 // Flacky on Windows 2000 bot. Disabled for now bug #1173138.
 TEST_F(InterstitialPageTest, DISABLED_TestShowInterstitialThenNavigate) {
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot);
-  ASSERT_TRUE(NULL != server.get());
-
+  TestServer server(kDocRoot);
   ::scoped_ptr<TabProxy> tab(GetActiveTabProxy());
   NavigateTab(tab.get(),
-              server->TestServerPageW(L"files/interstitial_page/google.html"));
+              server.TestServerPageW(L"files/interstitial_page/google.html"));
   EXPECT_EQ(L"Google", GetActiveTabTitle());
 
   tab->ShowInterstitialPage(kInterstitialPageHTMLText, action_timeout_ms());
   EXPECT_EQ(L"Interstitial page", GetActiveTabTitle());
 
   tab->NavigateToURL(
-      server->TestServerPageW(L"files/interstitial_page/shopping.html"));
+      server.TestServerPageW(L"files/interstitial_page/shopping.html"));
   EXPECT_EQ(L"Google Product Search", GetActiveTabTitle());
 }
 
 // Shows an interstitial page then closes the tab (to make sure we don't crash).
 TEST_F(InterstitialPageTest, TestShowInterstitialThenCloseTab) {
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot);
-  ASSERT_TRUE(NULL != server.get());
+  TestServer server(kDocRoot);
 
   // Create 2 tabs so closing one does not close the browser.
-  AppendTab(server->TestServerPageW(L"files/interstitial_page/google.html"));
+  AppendTab(server.TestServerPageW(L"files/interstitial_page/google.html"));
   ::scoped_ptr<TabProxy> tab(GetActiveTabProxy());
   EXPECT_EQ(L"Google", GetActiveTabTitle());
 
   tab->ShowInterstitialPage(kInterstitialPageHTMLText, action_timeout_ms());
   EXPECT_EQ(L"Interstitial page", GetActiveTabTitle());
   tab->Close();
 }
 
 // Shows an interstitial page then closes the browser (to make sure we don't
 // crash).
 // This test is disabled. See bug #1119448.
 TEST_F(InterstitialPageTest, DISABLED_TestShowInterstitialThenCloseBrowser) {
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot);
-  ASSERT_TRUE(NULL != server.get());
+  TestServer server(kDocRoot);
 
   ::scoped_ptr<TabProxy> tab(GetActiveTabProxy());
   tab->NavigateToURL(
-      server->TestServerPageW(L"files/interstitial_page/google.html"));
+      server.TestServerPageW(L"files/interstitial_page/google.html"));
   EXPECT_EQ(L"Google", GetActiveTabTitle());
 
   tab->ShowInterstitialPage(kInterstitialPageHTMLText, action_timeout_ms());
   EXPECT_EQ(L"Interstitial page", GetActiveTabTitle());
 
   scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
   EXPECT_TRUE(browser_proxy.get());
   bool application_closed;
   EXPECT_TRUE(CloseBrowser(browser_proxy.get(), &application_closed));
   EXPECT_TRUE(application_closed);
 }