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

Unified Diff: chrome/browser/captive_portal/captive_portal_browsertest.cc

Issue 10878003: Refactoring for merging WebSocket test server to net::TestServer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reflect Ryan's review Created 8 years, 4 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/browser/prerender/prerender_browsertest.cc » ('j') | net/test/base_test_server.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/captive_portal/captive_portal_browsertest.cc
diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc
index 208d7b819cf2a838921af2a17fb1e6dde50cf7e5..09b3460c9951193ed59a7ec53fa601e7dc87541d 100644
--- a/chrome/browser/captive_portal/captive_portal_browsertest.cc
+++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc
@@ -1574,10 +1574,11 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, RedirectSSLCertError) {
// Need an HTTP TestServer to handle a dynamically created server redirect.
ASSERT_TRUE(test_server()->Start());
- net::TestServer::HTTPSOptions https_options;
- https_options.server_certificate =
- net::TestServer::HTTPSOptions::CERT_MISMATCHED_NAME;
- net::TestServer https_server(https_options,
+ net::TestServer::SSLOptions ssl_options;
+ ssl_options.server_certificate =
+ net::TestServer::SSLOptions::CERT_MISMATCHED_NAME;
+ net::TestServer https_server(net::TestServer::TYPE_HTTPS,
+ ssl_options,
FilePath(FILE_PATH_LITERAL("chrome/test/data")));
ASSERT_TRUE(https_server.Start());
« no previous file with comments | « no previous file | chrome/browser/prerender/prerender_browsertest.cc » ('j') | net/test/base_test_server.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698