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

1 files changed, 7 insertions, 10 deletions

diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 21d1c72..4ab4285 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -180,17 +180,14 @@ TEST_F(URLRequestTest, GetTest) {
 }
 
 class HTTPSRequestTest : public testing::Test {
- protected:
-  HTTPSRequestTest() : util_() {}
-
-  SSLTestUtil util_;
 };
 
 #if defined(OS_MACOSX)
-// TODO(port): support temporary root cert on mac
-#define MAYBE_HTTPSGetTest DISABLED_HTTPSGetTest
+// ssl_client_socket_mac.cc crashes currently in GetSSLInfo
+// when called on a connection with an unrecognized certificate
+#define MAYBE_HTTPSGetTest   DISABLED_HTTPSGetTest
 #else
-#define MAYBE_HTTPSGetTest HTTPSGetTest
+#define MAYBE_HTTPSGetTest   HTTPSGetTest
 #endif
 
 TEST_F(HTTPSRequestTest, MAYBE_HTTPSGetTest) {
@@ -199,11 +196,9 @@ TEST_F(HTTPSRequestTest, MAYBE_HTTPSGetTest) {
   // so this test doesn't really need to specify a document root.
   // But if it did, a good one would be net/data/ssl.
   scoped_refptr<HTTPSTestServer> server =
-      HTTPSTestServer::CreateServer(util_.kHostName, util_.kOKHTTPSPort,
-      L"net/data/ssl", util_.GetOKCertPath().ToWStringHack());
+      HTTPSTestServer::CreateGoodServer(L"net/data/ssl");
   ASSERT_TRUE(NULL != server.get());
 
-  EXPECT_TRUE(util_.CheckCATrusted());
   TestDelegate d;
   {
     TestURLRequest r(server->TestServerPage(""), &d);
@@ -222,6 +217,8 @@ TEST_F(HTTPSRequestTest, MAYBE_HTTPSGetTest) {
 #endif
 }
 
+// TODO(dkegel): add test for expired and mismatched certificates here
+
 TEST_F(URLRequestTest, CancelTest) {
   TestDelegate d;
   {