google_apis/gcm/tools/mcs_probe.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: google_apis/gcm/tools/mcs_probe.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') | « extensions/shell/browser/shell_url_request_context_getter.cc ('k') | ios/crnet/crnet_environment.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: google_apis/gcm/tools/mcs_probe.cc

diff --git a/google_apis/gcm/tools/mcs_probe.cc b/google_apis/gcm/tools/mcs_probe.cc

index 9d0881b0f139d798caefb07f8cbb419a975cd04f..1063db9b587063d7c0b6721e9f9b4a64892bdde4 100644

--- a/google_apis/gcm/tools/mcs_probe.cc

+++ b/google_apis/gcm/tools/mcs_probe.cc

@@ -137,7 +137,7 @@ class MyTestURLRequestContext : public net::TestURLRequestContext {

context_storage_.set_host_resolver(

net::HostResolver::CreateDefaultResolver(NULL));

context_storage_.set_transport_security_state(

- new net::TransportSecurityState());

+ make_scoped_ptr(new net::TransportSecurityState()));

Init();

}

@@ -368,7 +368,7 @@ void MCSProbe::InitializeNetworkState() {

if (command_line_.HasSwitch(kIgnoreCertSwitch)) {

cert_verifier_.reset(new MyTestCertVerifier());

} else {

- cert_verifier_.reset(net::CertVerifier::CreateDefault());

+ cert_verifier_ = net::CertVerifier::CreateDefault();

}

system_channel_id_service_.reset(

new net::ChannelIDService(

@@ -382,7 +382,7 @@ void MCSProbe::InitializeNetworkState() {

host_resolver_.get(), std::string(), std::string(), false, false));

http_server_properties_.reset(new net::HttpServerPropertiesImpl());

host_mapping_rules_.reset(new net::HostMappingRules());

- proxy_service_.reset(net::ProxyService::CreateDirectWithNetLog(&net_log_));

+ proxy_service_ = net::ProxyService::CreateDirectWithNetLog(&net_log_);

}

void MCSProbe::BuildNetworkSession() {