From ac4335caebf2fd72609b0674fa8091198261405e Mon Sep 17 00:00:00 2001 From: "dkegel@google.com" Date: Thu, 19 Feb 2009 00:48:06 +0000 Subject: Revert 9992, as it broke origin-header-for-https.html on Webkit Linux builder Review URL: http://codereview.chromium.org/21488 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9997 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/ssl/ssl_uitest.cc | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'chrome/browser/ssl') 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 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)); -- cgit v1.1