Reverting r9823 (http://codereview.chromium.org/16207) because

1) the Interactive Tests (dbg) buildbot needs the SSL cert installed

2) the same buildbot showed a refcounting problem, e.g. 
FATAL:ref_counted.cc(22)] Check failed: in_dtor_. RefCounted object deleted without calling Release()
c:\b\slave\chromium-dbg-builder\build\src\chrome\browser\views\find_bar_win_interactive_uitest.cc(57): error: Value of: NULL != server.get()
  Actual: false
Expected: true
[  FAILED  ] FindInPageTest.CrashEscHandlers (2109 ms)

3) the Webkit Linux buildbot failed four tests
 redirect302-frames.html cross-frame-access-protocol-explicit-domain.html
 cross-frame-access-protocol.html origin-header-for-https.html

I'm leaving the tcp_pinger files in for the moment, they shouldn't hurt anything.

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

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

1 files changed, 10 insertions, 7 deletions

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