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

Unified Diff: remoting/base/url_request_context_getter.cc

Issue 1301333002: make ProxyService::CreateSystemProxyConfigService return scoped_ptrs NOT FOR REVIEW (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: try merging again... Created 5 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 | « net/url_request/url_request_ftp_job_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/base/url_request_context_getter.cc
diff --git a/remoting/base/url_request_context_getter.cc b/remoting/base/url_request_context_getter.cc
index b527481943dfdc860a8681bd2b56b6639fb35b10..7906f616fe54502633c6a957174976f57bbdfaaf 100644
--- a/remoting/base/url_request_context_getter.cc
+++ b/remoting/base/url_request_context_getter.cc
@@ -17,8 +17,8 @@ URLRequestContextGetter::URLRequestContextGetter(
scoped_refptr<base::SingleThreadTaskRunner> file_task_runner)
: network_task_runner_(network_task_runner),
file_task_runner_(file_task_runner) {
- proxy_config_service_.reset(net::ProxyService::CreateSystemProxyConfigService(
- network_task_runner_, file_task_runner));
+ proxy_config_service_ = net::ProxyService::CreateSystemProxyConfigService(
+ network_task_runner_, file_task_runner);
}
net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
« no previous file with comments | « net/url_request/url_request_ftp_job_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698