net/url_request/url_request_test_util.cc - Issue 295383007: Get rid of websocket_over_spdy_enabled global.

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: net/url_request/url_request_test_util.cc

Issue 295383007: Get rid of websocket_over_spdy_enabled global. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Response to rch's comments Created 6 years, 7 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: net/url_request/url_request_test_util.cc

diff --git a/net/url_request/url_request_test_util.cc b/net/url_request/url_request_test_util.cc

index 17ad31166fbe354f317561a2603be267d79ed911..e240082fd9d9e955a9dca45fe01c94f4a37f8ef1 100644

--- a/net/url_request/url_request_test_util.cc

+++ b/net/url_request/url_request_test_util.cc

@@ -95,6 +95,8 @@ void TestURLRequestContext::Init() {

EXPECT_FALSE(client_socket_factory_);

} else {

HttpNetworkSession::Params params;

+ if (http_network_session_params_)

+ params = *http_network_session_params_;

params.client_socket_factory = client_socket_factory();

params.host_resolver = host_resolver();

params.cert_verifier = cert_verifier();