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

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: 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 | « content/browser/resolve_proxy_msg_helper_unittest.cc ('k') | ios/crnet/crnet_environment.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 7f94355ea5448c4867f1393dfbbfb460d51f6500..27904b97ba52405fffe810b192fe356a1a7431c0 100644
--- a/content/shell/browser/shell_url_request_context_getter.cc
+++ b/content/shell/browser/shell_url_request_context_getter.cc
@@ -96,14 +96,14 @@ ShellURLRequestContextGetter::CreateNetworkDelegate() {
scoped_ptr<net::ProxyConfigService>
ShellURLRequestContextGetter::GetProxyConfigService() {
- return make_scoped_ptr(net::ProxyService::CreateSystemProxyConfigService(
- io_loop_->task_runner(), file_loop_->task_runner()));
+ return net::ProxyService::CreateSystemProxyConfigService(
+ io_loop_->task_runner(), file_loop_->task_runner()).Pass();
}
scoped_ptr<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() {
« no previous file with comments | « content/browser/resolve_proxy_msg_helper_unittest.cc ('k') | ios/crnet/crnet_environment.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698