diff options
author | dkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-19 22:57:09 +0000 |
---|---|---|
committer | dkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-19 22:57:09 +0000 |
commit | 73e0bbac9d097eff34726194d2095dce90f2dfa3 (patch) | |
tree | da2f14f77ee83984118e733a231ada709432ea52 /chrome/browser/net | |
parent | cefe1497a83ce69c7da0cec320e258e6f87b3aa9 (diff) | |
download | chromium_src-73e0bbac9d097eff34726194d2095dce90f2dfa3.zip chromium_src-73e0bbac9d097eff34726194d2095dce90f2dfa3.tar.gz chromium_src-73e0bbac9d097eff34726194d2095dce90f2dfa3.tar.bz2 |
Enable SSL error handling in Linux again.
Evan, could you review the change since http://codereview.chromium.org/20444 :
- load temporary root cert in test_shell
Thanks!
Review URL: http://codereview.chromium.org/20511
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10055 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net')
-rw-r--r-- | chrome/browser/net/url_fetcher_unittest.cc | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/chrome/browser/net/url_fetcher_unittest.cc b/chrome/browser/net/url_fetcher_unittest.cc index 6a6e3ff..6ac3614 100644 --- a/chrome/browser/net/url_fetcher_unittest.cc +++ b/chrome/browser/net/url_fetcher_unittest.cc @@ -105,10 +105,6 @@ class URLFetcherBadHTTPSTest : public URLFetcherTest { const ResponseCookies& cookies, const std::string& data); - protected: - FilePath GetExpiredCertPath(); - SSLTestUtil util_; - private: FilePath cert_dir_; }; @@ -300,10 +296,6 @@ 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( @@ -436,8 +428,7 @@ TEST_F(URLFetcherBadHTTPSTest, BadHTTPSTest) { TEST_F(URLFetcherBadHTTPSTest, DISABLED_BadHTTPSTest) { #endif scoped_refptr<HTTPSTestServer> server = - HTTPSTestServer::CreateServer(util_.kHostName, util_.kBadHTTPSPort, - kDocRoot, util_.GetExpiredCertPath().ToWStringHack()); + HTTPSTestServer::CreateExpiredServer(kDocRoot); ASSERT_TRUE(NULL != server.get()); CreateFetcher(GURL(server->TestServerPage("defaultresponse"))); |