Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(106)

Unified Diff: chrome/browser/ssl/ssl_browser_tests.cc

Issue 3812007: Support restriction the TLS cipher selection in test_server.py (Closed)
Patch Set: Rebase to trunk Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/common/net/url_fetcher_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ssl/ssl_browser_tests.cc
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
index 735941f00c7f66cf03f30f8a3b15d2ab73b04fea..247ae913a5743c43c648d48a0fe6a0a9f37107bb 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -20,13 +20,16 @@
const FilePath::CharType kDocRoot[] = FILE_PATH_LITERAL("chrome/test/data");
class SSLUITest : public InProcessBrowserTest {
+ typedef net::TestServer::HTTPSOptions HTTPSOptions;
+
public:
SSLUITest()
- : https_server_(net::TestServer::TYPE_HTTPS, FilePath(kDocRoot)),
- https_server_expired_(net::TestServer::TYPE_HTTPS_EXPIRED_CERTIFICATE,
- FilePath(kDocRoot)),
+ : https_server_(
+ HTTPSOptions(HTTPSOptions::CERT_OK), FilePath(kDocRoot)),
+ https_server_expired_(
+ HTTPSOptions(HTTPSOptions::CERT_EXPIRED), FilePath(kDocRoot)),
https_server_mismatched_(
- net::TestServer::TYPE_HTTPS_MISMATCHED_HOSTNAME,
+ HTTPSOptions(HTTPSOptions::CERT_MISMATCHED_NAME),
FilePath(kDocRoot)) {
EnableDOMAutomation();
}
« no previous file with comments | « no previous file | chrome/common/net/url_fetcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698