Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "net/socket/mock_client_socket_pool_manager.h" | 5 #include "net/socket/mock_client_socket_pool_manager.h" |
| 6 | 6 |
| 7 #include "base/values.h" | |
| 7 #include "net/http/http_proxy_client_socket_pool.h" | 8 #include "net/http/http_proxy_client_socket_pool.h" |
| 8 #include "net/socket/socks_client_socket_pool.h" | 9 #include "net/socket/socks_client_socket_pool.h" |
| 9 #include "net/socket/ssl_client_socket_pool.h" | 10 #include "net/socket/ssl_client_socket_pool.h" |
| 10 #include "net/socket/transport_client_socket_pool.h" | 11 #include "net/socket/transport_client_socket_pool.h" |
| 11 | 12 |
| 12 namespace net { | 13 namespace net { |
| 13 | 14 |
| 14 MockClientSocketPoolManager::MockClientSocketPoolManager() {} | 15 MockClientSocketPoolManager::MockClientSocketPoolManager() {} |
| 15 MockClientSocketPoolManager::~MockClientSocketPoolManager() {} | 16 MockClientSocketPoolManager::~MockClientSocketPoolManager() {} |
| 16 | 17 |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 79 | 80 |
| 80 SSLClientSocketPool* MockClientSocketPoolManager::GetSocketPoolForSSLWithProxy( | 81 SSLClientSocketPool* MockClientSocketPoolManager::GetSocketPoolForSSLWithProxy( |
| 81 const HostPortPair& proxy_server) { | 82 const HostPortPair& proxy_server) { |
| 82 SSLSocketPoolMap::const_iterator it = | 83 SSLSocketPoolMap::const_iterator it = |
| 83 ssl_socket_pools_for_proxies_.find(proxy_server); | 84 ssl_socket_pools_for_proxies_.find(proxy_server); |
| 84 if (it != ssl_socket_pools_for_proxies_.end()) | 85 if (it != ssl_socket_pools_for_proxies_.end()) |
| 85 return it->second; | 86 return it->second; |
| 86 return NULL; | 87 return NULL; |
| 87 } | 88 } |
| 88 | 89 |
| 89 base::Value* MockClientSocketPoolManager::SocketPoolInfoToValue() const { | 90 scoped_ptr<base::Value> MockClientSocketPoolManager::SocketPoolInfoToValue() |
| 91 const { | |
| 92 scoped_ptr<base::ListValue> list(new base::ListValue()); | |
|
eroman
2015/05/26 17:46:51
This is not equivalent. Before it was returning NU
| |
| 90 NOTIMPLEMENTED(); | 93 NOTIMPLEMENTED(); |
| 91 return NULL; | 94 return list.Pass(); |
| 92 } | 95 } |
| 93 | 96 |
| 94 } // namespace net | 97 } // namespace net |
| OLD | NEW |