Revert 7508.7509 and 7510

chrome/browser/session_history_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 "base/file_util.h"
 #include "base/win_util.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/ui/ui_test.h"
@@ skipping 89 matching lines @@
 
  protected:
   wstring url_prefix_;
   scoped_ptr<BrowserProxy> window_;
   scoped_ptr<TabProxy> tab_;
 };
 
 }  // namespace
 
 TEST_F(SessionHistoryTest, BasicBackForward) {
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot);
-  ASSERT_TRUE(NULL != server.get());
+  TestServer server(kDocRoot);
 
   // about:blank should be loaded first.
   ASSERT_FALSE(tab_->GoBack());
   EXPECT_EQ(L"", GetTabTitle());
 
   ASSERT_TRUE(tab_->NavigateToURL(
-      server->TestServerPage("files/session_history/bot1.html")));
+      server.TestServerPage("files/session_history/bot1.html")));
   EXPECT_EQ(L"bot1", GetTabTitle());
 
   ASSERT_TRUE(tab_->NavigateToURL(
-      server->TestServerPage("files/session_history/bot2.html")));
+      server.TestServerPage("files/session_history/bot2.html")));
   EXPECT_EQ(L"bot2", GetTabTitle());
 
   ASSERT_TRUE(tab_->NavigateToURL(
-      server->TestServerPage("files/session_history/bot3.html")));
+      server.TestServerPage("files/session_history/bot3.html")));
   EXPECT_EQ(L"bot3", GetTabTitle());
 
   // history is [blank, bot1, bot2, *bot3]
 
   ASSERT_TRUE(tab_->GoBack());
   EXPECT_EQ(L"bot2", GetTabTitle());
 
   ASSERT_TRUE(tab_->GoBack());
   EXPECT_EQ(L"bot1", GetTabTitle());
 
   ASSERT_TRUE(tab_->GoForward());
   EXPECT_EQ(L"bot2", GetTabTitle());
 
   ASSERT_TRUE(tab_->GoBack());
   EXPECT_EQ(L"bot1", GetTabTitle());
 
   ASSERT_TRUE(tab_->NavigateToURL(
-      server->TestServerPage("files/session_history/bot3.html")));
+      server.TestServerPage("files/session_history/bot3.html")));
   EXPECT_EQ(L"bot3", GetTabTitle());
 
   // history is [blank, bot1, *bot3]
 
   ASSERT_FALSE(tab_->GoForward());
   EXPECT_EQ(L"bot3", GetTabTitle());
 
   ASSERT_TRUE(tab_->GoBack());
   EXPECT_EQ(L"bot1", GetTabTitle());
 
@@ skipping 10 matching lines @@
   EXPECT_EQ(L"bot3", GetTabTitle());
 }
 
 // Test that back/forward works when navigating in subframes.
 TEST_F(SessionHistoryTest, FrameBackForward) {
   // Bug: http://b/1175763, skip this test on Windows 2000 until
   //      flakiness is investigated and fixed.
   if (win_util::GetWinVersion() <= win_util::WINVERSION_2000)
     return;
 
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot);
-  ASSERT_TRUE(NULL != server.get());
+  TestServer server(kDocRoot);
 
   // about:blank should be loaded first.
   GURL home(homepage_);
   ASSERT_FALSE(tab_->GoBack());
   EXPECT_EQ(L"", GetTabTitle());
   EXPECT_EQ(home, GetTabURL());
 
-  GURL frames(server->TestServerPage("files/session_history/frames.html"));
+  GURL frames(server.TestServerPage("files/session_history/frames.html"));
   ASSERT_TRUE(tab_->NavigateToURL(frames));
   EXPECT_EQ(L"bot1", GetTabTitle());
   EXPECT_EQ(frames, GetTabURL());
 
   ClickLink(L"abot2");
   EXPECT_EQ(L"bot2", GetTabTitle());
   EXPECT_EQ(frames, GetTabURL());
 
   ClickLink(L"abot3");
   EXPECT_EQ(L"bot3", GetTabTitle());
@@ skipping 35 matching lines @@
   EXPECT_EQ(L"bot2", GetTabTitle());
   EXPECT_EQ(frames, GetTabURL());
 
   ASSERT_TRUE(tab_->GoBack());
   EXPECT_EQ(L"bot1", GetTabTitle());
   EXPECT_EQ(frames, GetTabURL());
 }
 
 // Test that back/forward preserves POST data and document state in subframes.
 TEST_F(SessionHistoryTest, FrameFormBackForward) {
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot);
-  ASSERT_TRUE(NULL != server.get());
+  TestServer server(kDocRoot);
 
   // about:blank should be loaded first.
   ASSERT_FALSE(tab_->GoBack());
   EXPECT_EQ(L"", GetTabTitle());
 
-  GURL frames(server->TestServerPage("files/session_history/frames.html"));
+  GURL frames(server.TestServerPage("files/session_history/frames.html"));
   ASSERT_TRUE(tab_->NavigateToURL(frames));
   EXPECT_EQ(L"bot1", GetTabTitle());
 
   ClickLink(L"aform");
   EXPECT_EQ(L"form", GetTabTitle());
   EXPECT_EQ(frames, GetTabURL());
 
   SubmitForm(L"isubmit");
   EXPECT_EQ(L"text=&select=a", GetTabTitle());
   EXPECT_EQ(frames, GetTabURL());
@@ skipping 33 matching lines @@
 #endif
 }
 
 // TODO(mpcomplete): enable this when Bug 734372 is fixed:
 // "Doing a session history navigation does not restore newly-created subframe
 // document state"
 #if 0
 // Test that back/forward preserves POST data and document state when navigating
 // across frames (ie, from frame -> nonframe).
 TEST_F(SessionHistoryTest, CrossFrameFormBackForward) {
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot);
-  ASSERT_TRUE(NULL != server.get());
+  TestServer server(kDocRoot);
 
   // about:blank should be loaded first.
   ASSERT_FALSE(tab_->GoBack());
   EXPECT_EQ(L"", GetTabTitle());
 
-  GURL frames(server->TestServerPage("files/session_history/frames.html"));
+  GURL frames(server.TestServerPage("files/session_history/frames.html"));
   ASSERT_TRUE(tab_->NavigateToURL(frames));
   EXPECT_EQ(L"bot1", GetTabTitle());
 
   ClickLink(L"aform");
   EXPECT_EQ(L"form", GetTabTitle());
   EXPECT_EQ(frames, GetTabURL());
 
   SubmitForm(L"isubmit");
   EXPECT_EQ(L"text=&select=a", GetTabTitle());
   EXPECT_EQ(frames, GetTabURL());
@@ skipping 15 matching lines @@
   ASSERT_TRUE(tab_->GoBack());
   EXPECT_EQ(L"form", GetTabTitle());
   EXPECT_EQ(frames, GetTabURL());
 
   SubmitForm(L"isubmit");
   EXPECT_EQ(L"text=&select=a", GetTabTitle());
   EXPECT_EQ(frames, GetTabURL());
 }
 #endif
 
-// Test that back/forward entries are created for reference fragment
-// navigations. Bug 730379.
+// Test that back/forward entries are created for reference fragment navigations.
+// Bug 730379.
 TEST_F(SessionHistoryTest, FragmentBackForward) {
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot);
-  ASSERT_TRUE(NULL != server.get());
+  TestServer server(kDocRoot);
 
   // about:blank should be loaded first.
   ASSERT_FALSE(tab_->GoBack());
   EXPECT_EQ(L"", GetTabTitle());
 
-  GURL fragment(server->TestServerPage("files/session_history/fragment.html"));
+  GURL fragment(server.TestServerPage("files/session_history/fragment.html"));
   ASSERT_TRUE(tab_->NavigateToURL(fragment));
   EXPECT_EQ(L"fragment", GetTabTitle());
   EXPECT_EQ(fragment, GetTabURL());
 
   GURL::Replacements ref_params;
 
   ref_params.SetRef("a", url_parse::Component(0, 1));
   GURL fragment_a(fragment.ReplaceComponents(ref_params));
   ASSERT_TRUE(tab_->NavigateToURL(fragment_a));
   EXPECT_EQ(L"fragment", GetTabTitle());
@@ skipping 18 matching lines @@
 
   ASSERT_TRUE(tab_->GoBack());
   EXPECT_EQ(fragment_a, GetTabURL());
 
   ASSERT_TRUE(tab_->GoBack());
   EXPECT_EQ(fragment, GetTabURL());
 
   ASSERT_TRUE(tab_->GoForward());
   EXPECT_EQ(fragment_a, GetTabURL());
 
-  GURL bot3(server->TestServerPage("files/session_history/bot3.html"));
+  GURL bot3(server.TestServerPage("files/session_history/bot3.html"));
   ASSERT_TRUE(tab_->NavigateToURL(bot3));
   EXPECT_EQ(L"bot3", GetTabTitle());
   EXPECT_EQ(bot3, GetTabURL());
 
   // history is [blank, fragment, fragment#a, bot3]
 
   ASSERT_FALSE(tab_->GoForward());
   EXPECT_EQ(bot3, GetTabURL());
 
   ASSERT_TRUE(tab_->GoBack());
   EXPECT_EQ(fragment_a, GetTabURL());
 
   ASSERT_TRUE(tab_->GoBack());
   EXPECT_EQ(fragment, GetTabURL());
 }
 
 // Test that the javascript window.history object works.
 // NOTE: history.go(N) does not do anything if N is outside the bounds of the
 // back/forward list (such as trigger our start/stop loading events).  This
 // means the test will hang if it attempts to navigate too far forward or back,
 // since we'll be waiting forever for a load stop event.
 TEST_F(SessionHistoryTest, JavascriptHistory) {
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot);
-  ASSERT_TRUE(NULL != server.get());
+  TestServer server(kDocRoot);
 
   // about:blank should be loaded first.
   ASSERT_FALSE(tab_->GoBack());
   EXPECT_EQ(L"", GetTabTitle());
 
   ASSERT_TRUE(tab_->NavigateToURL(
-      server->TestServerPage("files/session_history/bot1.html")));
+      server.TestServerPage("files/session_history/bot1.html")));
   EXPECT_EQ(L"bot1", GetTabTitle());
 
   ASSERT_TRUE(tab_->NavigateToURL(
-      server->TestServerPage("files/session_history/bot2.html")));
+      server.TestServerPage("files/session_history/bot2.html")));
   EXPECT_EQ(L"bot2", GetTabTitle());
 
   ASSERT_TRUE(tab_->NavigateToURL(
-      server->TestServerPage("files/session_history/bot3.html")));
+      server.TestServerPage("files/session_history/bot3.html")));
   EXPECT_EQ(L"bot3", GetTabTitle());
 
   // history is [blank, bot1, bot2, *bot3]
 
   JavascriptGo("-1");
   EXPECT_EQ(L"bot2", GetTabTitle());
 
   JavascriptGo("-1");
   EXPECT_EQ(L"bot1", GetTabTitle());
 
@@ skipping 11 matching lines @@
   JavascriptGo("-3");
   EXPECT_EQ(L"", GetTabTitle());
 
   ASSERT_FALSE(tab_->GoBack());
   EXPECT_EQ(L"", GetTabTitle());
 
   JavascriptGo("1");
   EXPECT_EQ(L"bot1", GetTabTitle());
 
   ASSERT_TRUE(tab_->NavigateToURL(
-      server->TestServerPage("files/session_history/bot3.html")));
+      server.TestServerPage("files/session_history/bot3.html")));
   EXPECT_EQ(L"bot3", GetTabTitle());
 
   // history is [blank, bot1, *bot3]
 
   ASSERT_FALSE(tab_->GoForward());
   EXPECT_EQ(L"bot3", GetTabTitle());
 
   JavascriptGo("-1");
   EXPECT_EQ(L"bot1", GetTabTitle());
 
@@ skipping 13 matching lines @@
   // types.  For example, load about:network in a tab, then a real page, then
   // try to go back and forward with JavaScript.  Bug 1136715.
   // (Hard to test right now, because pages like about:network cause the
   // TabProxy to hang.  This is because they do not appear to use the
   // NotificationService.)
 }
 
 TEST_F(SessionHistoryTest, LocationReplace) {
   // Test that using location.replace doesn't leave the title of the old page
   // visible.
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot);
-  ASSERT_TRUE(NULL != server.get());
+  TestServer server(kDocRoot);
 
-  ASSERT_TRUE(tab_->NavigateToURL(server->TestServerPage(
-      "files/session_history/replace.html?no-title.html")));
+  ASSERT_TRUE(tab_->NavigateToURL(
+      server.TestServerPage("files/session_history/replace.html?no-title.html")));
   EXPECT_EQ(L"", GetTabTitle());
 }