net/websockets/websocket_test_util.cc - Issue 1290243007: Shift URLRequestContextStorage over to taking scoped_ptrs.

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/websockets/websocket_test_util.cc

Issue 1290243007: Shift URLRequestContextStorage over to taking scoped_ptrs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Paul_BuilderGrab

Patch Set: Sync'd to revision p347709. Created 5 years, 3 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

« content/shell/browser/shell_url_request_context_getter.cc ('K') | « net/url_request/url_request_test_util.cc ('k') | remoting/host/token_validator_factory_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/websockets/websocket_test_util.cc

diff --git a/net/websockets/websocket_test_util.cc b/net/websockets/websocket_test_util.cc

index 1df055286653dc88f50c6be9773da5c370b6ee23..fd5421a59b3ffaf3d8775a980cdc702839e2569c 100644

--- a/net/websockets/websocket_test_util.cc

+++ b/net/websockets/websocket_test_util.cc

@@ -164,7 +164,7 @@ void WebSocketTestURLRequestContextHost::AddSSLSocketDataProvider(

void WebSocketTestURLRequestContextHost::SetProxyConfig(

const std::string& proxy_rules) {

DCHECK(!url_request_context_initialized_);

- proxy_service_.reset(ProxyService::CreateFixed(proxy_rules));

+ proxy_service_ = ProxyService::CreateFixed(proxy_rules);

url_request_context_.set_proxy_service(proxy_service_.get());

}