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

2 files changed, 20 insertions, 5 deletions

diff --git a/chrome/browser/net/url_fetcher_unittest.cc b/chrome/browser/net/url_fetcher_unittest.cc
index a9f0c0f17..03b40d7 100644
--- a/chrome/browser/net/url_fetcher_unittest.cc
+++ b/chrome/browser/net/url_fetcher_unittest.cc
@@ -104,6 +104,10 @@ class URLFetcherBadHTTPSTest : public URLFetcherTest {
                                   const ResponseCookies& cookies,
                                   const std::string& data);
 
+ protected:
+  FilePath GetExpiredCertPath();
+  SSLTestUtil util_;
+
  private:
   FilePath cert_dir_;
 };
@@ -295,6 +299,10 @@ 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(
@@ -427,7 +435,8 @@ TEST_F(URLFetcherBadHTTPSTest, BadHTTPSTest) {
 TEST_F(URLFetcherBadHTTPSTest, DISABLED_BadHTTPSTest) {
 #endif
   scoped_refptr<HTTPSTestServer> server =
-      HTTPSTestServer::CreateExpiredServer(kDocRoot);
+      HTTPSTestServer::CreateServer(util_.kHostName, util_.kBadHTTPSPort,
+          kDocRoot, util_.GetExpiredCertPath().ToWStringHack());
   ASSERT_TRUE(NULL != server.get());
 
   CreateFetcher(GURL(server->TestServerPage("defaultresponse")));
diff --git a/chrome/browser/ssl/ssl_uitest.cc b/chrome/browser/ssl/ssl_uitest.cc
index 47f4753..f31d8f2 100644
--- a/chrome/browser/ssl/ssl_uitest.cc
+++ b/chrome/browser/ssl/ssl_uitest.cc
@@ -23,6 +23,7 @@ class SSLUITest : public UITest {
  protected:
   SSLUITest() {
     dom_automation_enabled_ = true;
+    EXPECT_TRUE(util_.CheckCATrusted());
   }
 
   TabProxy* GetActiveTabProxy() {
@@ -46,14 +47,18 @@ class SSLUITest : public UITest {
   }
 
   HTTPSTestServer* GoodCertServer() {
-    return HTTPSTestServer::CreateGoodServer(kDocRoot);
+    return HTTPSTestServer::CreateServer(util_.kHostName, util_.kOKHTTPSPort,
+        kDocRoot, util_.GetOKCertPath().ToWStringHack());
   }
 
   HTTPSTestServer* BadCertServer() {
-    return HTTPSTestServer::CreateExpiredServer(kDocRoot);
+    return HTTPSTestServer::CreateServer(util_.kHostName, util_.kBadHTTPSPort,
+        kDocRoot, util_.GetExpiredCertPath().ToWStringHack());
   }
 
  protected:
+  SSLTestUtil util_;
+
   DISALLOW_COPY_AND_ASSIGN(SSLUITest);
 };
 
@@ -419,7 +424,8 @@ TEST_F(SSLUITest, TestCachedMixedContents) {
 TEST_F(SSLUITest, DISABLED_TestCNInvalidStickiness) {
   const std::string kLocalHost = "localhost";
   scoped_refptr<HTTPSTestServer> https_server =
-      HTTPSTestServer::CreateMismatchedServer(kDocRoot);
+      HTTPSTestServer::CreateServer(kLocalHost, util_.kOKHTTPSPort,
+      kDocRoot, util_.GetOKCertPath().ToWStringHack());
   ASSERT_TRUE(NULL != https_server.get());
 
   // First we hit the server with hostname, this generates an invalid policy
@@ -456,7 +462,7 @@ TEST_F(SSLUITest, DISABLED_TestCNInvalidStickiness) {
   ASSERT_TRUE(hostname_index != std::string::npos);  // Test sanity check.
   std::string new_url;
   new_url.append(url.spec().substr(0, hostname_index));
-  new_url.append(net::TestServerLauncher::kHostName);
+  new_url.append(util_.kHostName);
   new_url.append(url.spec().substr(hostname_index + kLocalHost.size()));
 
   NavigateTab(tab.get(), GURL(new_url));