Revert 7508.7509 and 7510

chrome/browser/tab_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/win_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 115 matching lines @@
   // And make sure the URLs matches.
   ASSERT_EQ(url2_, GetActiveTabURL());
   ASSERT_TRUE(tab_proxy->GoBack());
   ASSERT_EQ(url1_, GetActiveTabURL());
 }
 
 // Tests that a duplicate history entry is not created when we restore a page
 // to an existing SiteInstance.  (Bug 1230446)
 TEST_F(TabRestoreUITest, RestoreWithExistingSiteInstance) {
   const wchar_t kDocRoot[] = L"chrome/test/data";
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot);
-  ASSERT_TRUE(NULL != server.get());
-  GURL http_url1(server->TestServerPageW(L"files/title1.html"));
-  GURL http_url2(server->TestServerPageW(L"files/title2.html"));
+  TestServer server(kDocRoot);
+  GURL http_url1(server.TestServerPageW(L"files/title1.html"));
+  GURL http_url2(server.TestServerPageW(L"files/title2.html"));
 
   scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
   int initial_tab_count;
   ASSERT_TRUE(browser_proxy->GetTabCount(&initial_tab_count));
 
   // Add a tab
   browser_proxy->AppendTab(http_url1);
   int new_tab_count;
   ASSERT_TRUE(browser_proxy->WaitForTabCountToChange(initial_tab_count,
                                                      &new_tab_count,
@@ skipping 20 matching lines @@
   ASSERT_EQ(http_url2, GetActiveTabURL());
   ASSERT_TRUE(tab->GoBack());
   ASSERT_EQ(http_url1, GetActiveTabURL());
 }
 
 // Tests that the SiteInstances used for entries in a restored tab's history
 // are given appropriate max page IDs, even if the renderer for the entry
 // already exists.  (Bug 1204135)
 TEST_F(TabRestoreUITest, RestoreCrossSiteWithExistingSiteInstance) {
   const wchar_t kDocRoot[] = L"chrome/test/data";
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(kDocRoot);
-  ASSERT_TRUE(NULL != server.get());
-  GURL http_url1(server->TestServerPageW(L"files/title1.html"));
-  GURL http_url2(server->TestServerPageW(L"files/title2.html"));
+  TestServer server(kDocRoot);
+  GURL http_url1(server.TestServerPageW(L"files/title1.html"));
+  GURL http_url2(server.TestServerPageW(L"files/title2.html"));
 
   scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
   int initial_tab_count;
   ASSERT_TRUE(browser_proxy->GetTabCount(&initial_tab_count));
 
   // Add a tab
   browser_proxy->AppendTab(http_url1);
   int new_tab_count;
   ASSERT_TRUE(browser_proxy->WaitForTabCountToChange(initial_tab_count,
                                                      &new_tab_count,
@@ skipping 76 matching lines @@
   GURL url;
   ASSERT_TRUE(restored_tab_proxy->GetCurrentURL(&url));
   ASSERT_TRUE(url == url1_);
 
   restored_tab_proxy.reset(
         browser_proxy->GetTab(initial_tab_count + 1));
   ASSERT_TRUE(restored_tab_proxy->WaitForTabToBeRestored(kWaitForActionMsec));
   ASSERT_TRUE(restored_tab_proxy->GetCurrentURL(&url));
   ASSERT_TRUE(url == url2_);
 }