Chromium Code Reviews| Index: net/socket/mock_client_socket_pool_manager.cc |
| diff --git a/net/socket/mock_client_socket_pool_manager.cc b/net/socket/mock_client_socket_pool_manager.cc |
| index 0496adb9636b7d46b54feae78a44dd595df42903..632e20a7e351f61907e6bb8337d9c732d12aad08 100644 |
| --- a/net/socket/mock_client_socket_pool_manager.cc |
| +++ b/net/socket/mock_client_socket_pool_manager.cc |
| @@ -4,6 +4,7 @@ |
| #include "net/socket/mock_client_socket_pool_manager.h" |
| +#include "base/values.h" |
| #include "net/http/http_proxy_client_socket_pool.h" |
| #include "net/socket/socks_client_socket_pool.h" |
| #include "net/socket/ssl_client_socket_pool.h" |
| @@ -86,9 +87,11 @@ SSLClientSocketPool* MockClientSocketPoolManager::GetSocketPoolForSSLWithProxy( |
| return NULL; |
| } |
| -base::Value* MockClientSocketPoolManager::SocketPoolInfoToValue() const { |
| +scoped_ptr<base::Value> MockClientSocketPoolManager::SocketPoolInfoToValue() |
| + const { |
| + scoped_ptr<base::ListValue> list(new base::ListValue()); |
|
eroman
2015/05/26 17:46:51
This is not equivalent. Before it was returning NU
|
| NOTIMPLEMENTED(); |
| - return NULL; |
| + return list.Pass(); |
| } |
| } // namespace net |