| Index: net/url_request/url_request_context_builder.cc
|
| diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
|
| index a488d2f6ae297c2e06fa79f992bf8a32c84b4532..9c7d9a09c04696ba3b217bb2a9b7c358526e2fb3 100644
|
| --- a/net/url_request/url_request_context_builder.cc
|
| +++ b/net/url_request/url_request_context_builder.cc
|
| @@ -277,11 +277,12 @@ scoped_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
|
| // TODO(willchan): Switch to using this code when
|
| // ProxyService::CreateSystemProxyConfigService()'s signature doesn't suck.
|
| #if defined(OS_LINUX) || defined(OS_ANDROID)
|
| - ProxyConfigService* proxy_config_service = proxy_config_service_.release();
|
| + scoped_ptr<ProxyConfigService> proxy_config_service(
|
| + proxy_config_service_.release());
|
| #else
|
| - ProxyConfigService* proxy_config_service = NULL;
|
| + scoped_ptr<ProxyConfigService> proxy_config_service;
|
| if (proxy_config_service_) {
|
| - proxy_config_service = proxy_config_service_.release();
|
| + proxy_config_service.reset(proxy_config_service_.release());
|
| } else {
|
| proxy_config_service = ProxyService::CreateSystemProxyConfigService(
|
| base::ThreadTaskRunnerHandle::Get().get(),
|
| @@ -289,7 +290,7 @@ scoped_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
|
| }
|
| #endif // defined(OS_LINUX) || defined(OS_ANDROID)
|
| proxy_service_ = ProxyService::CreateUsingSystemProxyResolver(
|
| - proxy_config_service,
|
| + proxy_config_service.Pass(),
|
| 0, // This results in using the default value.
|
| context->net_log());
|
| }
|
|
|