Revert 7508.7509 and 7510

chrome/common/net/cache_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 "base/string_util.h"
 #include "chrome/test/ui/ui_test.h"
 #include "chrome/test/automation/automation_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
@@ skipping 36 matching lines @@
     // Appends a new tab to the test chrome window and loads the specified
     // URL. The new tab will try to get the URL from the cache before requesting
     // the server for it.
     void GetNewTab(AutomationProxy* automationProxy, const GURL& tab_url);
 };
 
 // Runs the cache test for the specified path.
 void CacheTest::RunCacheTest(const std::wstring &url,
                              bool expect_new_tab_cached,
                              bool expect_delayed_reload) {
-  scoped_refptr<HTTPTestServer> server =
-      HTTPTestServer::CreateServer(L"chrome/test/data");
-  ASSERT_TRUE(NULL != server.get());
-  GURL test_page(server->TestServerPageW(url));
+  TestServer server(L"chrome/test/data");
+  GURL test_page(server.TestServerPageW(url));
 
   NavigateToURL(test_page);
   std::wstring original_time = GetActiveTabTitle();
 
   Sleep(kWaitForCacheUpdateMsec);
 
   GetNewTab(automation(), test_page);
   std::wstring revisit_time = GetActiveTabTitle();
 
   if (expect_new_tab_cached) {
@@ skipping 99 matching lines @@
 TEST_F(CacheTest, NoStoreMaxAge) {
   RunCacheTest(L"cache/no-store/max-age", false, false);
 }
 
 // Tests that a cached copy of the page is not transformed when no-transform
 // header is specified.
 TEST_F(CacheTest, NoTransform) {
   RunCacheTest(L"cache/no-transform", false, false);
 }