chrome/test/ppapi/ppapi_test.cc - Issue 10878003: Refactoring for merging WebSocket test server to net::TestServer

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/test/ppapi/ppapi_test.cc

Issue 10878003: Refactoring for merging WebSocket test server to net::TestServer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 5 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:

Index: chrome/test/ppapi/ppapi_test.cc

diff --git a/chrome/test/ppapi/ppapi_test.cc b/chrome/test/ppapi/ppapi_test.cc

index 717eb282607db0c7abe5bee8440620a8654e7f46..4bf77ba22a6cd3aa4293245647365d6e87ba55f5 100644

--- a/chrome/test/ppapi/ppapi_test.cc

+++ b/chrome/test/ppapi/ppapi_test.cc

@@ -173,7 +173,8 @@ void PPAPITestBase::RunTestViaHTTP(const std::string& test_case) {

void PPAPITestBase::RunTestWithSSLServer(const std::string& test_case) {

FilePath document_root;

ASSERT_TRUE(ui_test_utils::GetRelativeBuildDirectory(&document_root));

- net::TestServer test_server(net::BaseTestServer::HTTPSOptions(),

+ net::TestServer test_server(net::TestServer::TYPE_HTTPS,

+ net::BaseTestServer::SSLOptions(),

document_root);

ASSERT_TRUE(test_server.Start());

uint16_t port = test_server.host_port_pair().port();