Chromium Code Reviews| Index: net/socket/client_socket_pool_base.h |
| diff --git a/net/socket/client_socket_pool_base.h b/net/socket/client_socket_pool_base.h |
| index 7686715597afa88ab31f41eed79dd11d905f0bcd..3835a87959cc8380877f961607023877c44445bd 100644 |
| --- a/net/socket/client_socket_pool_base.h |
| +++ b/net/socket/client_socket_pool_base.h |
| @@ -326,7 +326,7 @@ class NET_EXPORT_PRIVATE ClientSocketPoolBaseHelper |
| bool CloseOneIdleConnectionInHigherLayeredPool(); |
| // See ClientSocketPool::GetInfoAsValue for documentation on this function. |
| - base::DictionaryValue* GetInfoAsValue(const std::string& name, |
| + scoped_ptr<base::DictionaryValue> GetInfoAsValue(const std::string& name, |
| const std::string& type) const; |
|
eroman
2015/06/01 17:07:23
Have you re-run "git cl format" ?
|
| base::TimeDelta ConnectionTimeout() const { |
| @@ -827,9 +827,9 @@ class ClientSocketPoolBase { |
| return helper_.CleanupIdleSockets(force); |
| } |
| - base::DictionaryValue* GetInfoAsValue(const std::string& name, |
| + scoped_ptr<base::DictionaryValue> GetInfoAsValue(const std::string& name, |
| const std::string& type) const { |
| - return helper_.GetInfoAsValue(name, type); |
| + return helper_.GetInfoAsValue(name, type).Pass(); |
|
eroman
2015/06/01 17:07:23
Pass() is unnecessary
|
| } |
| base::TimeDelta ConnectionTimeout() const { |