| 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() {
|
|
|