Chromium Code Reviews| Index: net/http/http_proxy_client_socket_pool.cc |
| diff --git a/net/http/http_proxy_client_socket_pool.cc b/net/http/http_proxy_client_socket_pool.cc |
| index 6ea447c356906eb04f90e4a5062d2389addbb2ec..58652155148b280aed1053046aec46acd3ba2dfc 100644 |
| --- a/net/http/http_proxy_client_socket_pool.cc |
| +++ b/net/http/http_proxy_client_socket_pool.cc |
| @@ -511,11 +511,12 @@ LoadState HttpProxyClientSocketPool::GetLoadState( |
| return base_.GetLoadState(group_name, handle); |
| } |
| -base::DictionaryValue* HttpProxyClientSocketPool::GetInfoAsValue( |
| +scoped_ptr<base::DictionaryValue> HttpProxyClientSocketPool::GetInfoAsValue( |
| const std::string& name, |
| const std::string& type, |
| bool include_nested_pools) const { |
| - base::DictionaryValue* dict = base_.GetInfoAsValue(name, type); |
| + scoped_ptr<base::DictionaryValue> |
| + dict(base_.GetInfoAsValue(name, type).Pass()); |
|
eroman
2015/06/01 17:07:22
No need for .Pass(), can directly assign
|
| if (include_nested_pools) { |
| base::ListValue* list = new base::ListValue(); |
| if (transport_pool_) { |
| @@ -530,7 +531,7 @@ base::DictionaryValue* HttpProxyClientSocketPool::GetInfoAsValue( |
| } |
| dict->Set("nested_pools", list); |
| } |
| - return dict; |
| + return dict.Pass(); |
| } |
| base::TimeDelta HttpProxyClientSocketPool::ConnectionTimeout() const { |