diff options
| author | dkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-14 05:26:10 +0000 |
|---|---|---|
| committer | dkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-14 05:26:10 +0000 |
| commit | ee287e40bb740d7238717a97b5f635ae3e68c47a (patch) | |
| tree | 4515656a0a870939dbcf6892b48baa02c99c26ca /chrome/browser/net | |
| parent | 0afe827a49501c6801c3c9efbbdb1f64aa010beb (diff) | |
| download | chromium_src-ee287e40bb740d7238717a97b5f635ae3e68c47a.zip chromium_src-ee287e40bb740d7238717a97b5f635ae3e68c47a.tar.gz chromium_src-ee287e40bb740d7238717a97b5f635ae3e68c47a.tar.bz2 | |
ssl_client_socket_unittest.cc: launch local server with TestServerLauncher
rather than use bugs.webkit.org, fixes TODO(darin)
Add tests with bad server certs
ssl_client_socket_nss.cc: fix bugs revealed by new tests
tcp_pinger.cc: helper class to do synchronous connect from tests.
Has to work inside ui tests where one can't use TestCompletionCallback.
ssl_test_util: renamed class TestServerLauncher, added Start/Stop methods.
Make part of net.lib to work around link error in test_shell_tests.
url_request_unittest.h: use TestServerLauncher to manage server.
SSL client tests disabled for now on Mac.
BUG=7114
Review URL: http://codereview.chromium.org/16207
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9823 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 03b40d7..a9f0c0f17 100644 --- a/chrome/browser/net/url_fetcher_unittest.cc +++ b/chrome/browser/net/url_fetcher_unittest.cc @@ -104,10 +104,6 @@ class URLFetcherBadHTTPSTest : public URLFetcherTest { const ResponseCookies& cookies, const std::string& data); - protected: - FilePath GetExpiredCertPath(); - SSLTestUtil util_; - private: FilePath cert_dir_; }; @@ -299,10 +295,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( @@ -435,8 +427,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"))); |