Make ssl_client_socket_unittest use a local server

net/url_request/url_request_unittest.cc

Index: net/url_request/url_request_unittest.cc
===================================================================
--- net/url_request/url_request_unittest.cc	(revision 9822)
+++ net/url_request/url_request_unittest.cc	(working copy)
@@ -180,17 +180,14 @@
 }
 
 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 @@
   // 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 @@
 #endif
 }
 
+// TODO(dkegel): add test for expired and mismatched certificates here
+
 TEST_F(URLRequestTest, CancelTest) {
   TestDelegate d;
   {