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

Unified Diff: content/shell/browser/shell_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: non linux builds 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
Index: content/shell/browser/shell_url_request_context_getter.cc
diff --git a/content/shell/browser/shell_url_request_context_getter.cc b/content/shell/browser/shell_url_request_context_getter.cc
index cafda2de06448a5cec22cae201a3ac5115ed60aa..34f69bd0c283ab66e670626c169ad3cb30f2aa49 100644
--- a/content/shell/browser/shell_url_request_context_getter.cc
+++ b/content/shell/browser/shell_url_request_context_getter.cc
@@ -94,13 +94,14 @@ net::NetworkDelegate* ShellURLRequestContextGetter::CreateNetworkDelegate() {
net::ProxyConfigService* ShellURLRequestContextGetter::GetProxyConfigService() {
return net::ProxyService::CreateSystemProxyConfigService(
- io_loop_->task_runner(), file_loop_->task_runner());
+ io_loop_->task_runner(), file_loop_->task_runner())
+ .get();
Randy Smith (Not in Mondays) 2015/08/24 21:58:19 I think this is broken. What'll happen is the net
}
net::ProxyService* ShellURLRequestContextGetter::GetProxyService() {
// TODO(jam): use v8 if possible, look at chrome code.
return net::ProxyService::CreateUsingSystemProxyResolver(
- proxy_config_service_.release(), 0, url_request_context_->net_log());
+ proxy_config_service_.Pass(), 0, url_request_context_->net_log());
}
net::URLRequestContext* ShellURLRequestContextGetter::GetURLRequestContext() {

Powered by Google App Engine
This is Rietveld 408576698