Revert 9992, as it broke origin-header-for-https.html on Webkit Linux builder

Review URL: http://codereview.chromium.org/21488

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9997 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 1 deletions

diff --git a/chrome/browser/net/url_fetcher_unittest.cc b/chrome/browser/net/url_fetcher_unittest.cc
index 6ac3614..6a6e3ff 100644
--- a/chrome/browser/net/url_fetcher_unittest.cc
+++ b/chrome/browser/net/url_fetcher_unittest.cc
@@ -105,6 +105,10 @@ class URLFetcherBadHTTPSTest : public URLFetcherTest {
                                   const ResponseCookies& cookies,
                                   const std::string& data);
 
+ protected:
+  FilePath GetExpiredCertPath();
+  SSLTestUtil util_;
+
  private:
   FilePath cert_dir_;
 };
@@ -296,6 +300,10 @@ void URLFetcherBadHTTPSTest::OnURLFetchComplete(
   io_loop_.Quit();
 }
 
+FilePath URLFetcherBadHTTPSTest::GetExpiredCertPath() {
+  return cert_dir_.AppendASCII("expired_cert.pem");
+}
+
 void URLFetcherCancelTest::CreateFetcher(const GURL& url) {
   fetcher_ = new URLFetcher(url, URLFetcher::GET, this);
   fetcher_->set_request_context(
@@ -428,7 +436,8 @@ TEST_F(URLFetcherBadHTTPSTest, BadHTTPSTest) {
 TEST_F(URLFetcherBadHTTPSTest, DISABLED_BadHTTPSTest) {
 #endif
   scoped_refptr<HTTPSTestServer> server =
-      HTTPSTestServer::CreateExpiredServer(kDocRoot);
+      HTTPSTestServer::CreateServer(util_.kHostName, util_.kBadHTTPSPort,
+          kDocRoot, util_.GetExpiredCertPath().ToWStringHack());
   ASSERT_TRUE(NULL != server.get());
 
   CreateFetcher(GURL(server->TestServerPage("defaultresponse")));