Revert 7508.7509 and 7510

chrome/browser/sessions/session_restore_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/command_line.h"
 #include "base/file_util.h"
 #include "base/scoped_ptr.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 127 matching lines @@
   ASSERT_TRUE(GetActiveTabURL() == url2);
   ASSERT_TRUE(tab_proxy->GoBack());
   ASSERT_TRUE(GetActiveTabURL() == url1);
 }
 
 // Tests that the SiteInstances used for entries in a restored tab's history
 // are given appropriate max page IDs, so that going back to a restored
 // cross-site page and then forward again works.  (Bug 1204135)
 TEST_F(SessionRestoreUITest, RestoresCrossSiteForwardAndBackwardNavs) {
   const wchar_t kDocRoot[] = L"chrome/test/data";
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot);
-  ASSERT_TRUE(NULL != server.get());
-  GURL cross_site_url(server->TestServerPageW(L"files/title2.html"));
+  TestServer server(kDocRoot);
+  GURL cross_site_url(server.TestServerPageW(L"files/title2.html"));
 
   // Visit URLs on different sites.
   NavigateToURL(url1);
   NavigateToURL(cross_site_url);
   NavigateToURL(url2);
 
   ASSERT_TRUE(GetActiveTab()->GoBack());
 
   QuitBrowserAndRestore();
 
@@ skipping 262 matching lines @@
   scoped_ptr<TabProxy> tab_proxy(browser_proxy->GetTab(restored_tab_count - 2));
   ASSERT_TRUE(tab_proxy.get() != NULL);
   ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(kWaitForActionMsec));
   tab_proxy.reset(browser_proxy->GetTab(restored_tab_count - 1));
   ASSERT_TRUE(tab_proxy.get() != NULL);
   ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(kWaitForActionMsec));
 
   ASSERT_EQ(expected_process_count, GetBrowserProcessCount());
 }