summaryrefslogtreecommitdiffstats
path: root/net/socket/socks_client_socket_pool.h
diff options
context:
space:
mode:
Diffstat (limited to 'net/socket/socks_client_socket_pool.h')
-rw-r--r--net/socket/socks_client_socket_pool.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/socket/socks_client_socket_pool.h b/net/socket/socks_client_socket_pool.h
index 418d38c..0bea2cc 100644
--- a/net/socket/socks_client_socket_pool.h
+++ b/net/socket/socks_client_socket_pool.h
@@ -140,10 +140,9 @@ class SOCKSClientSocketPool : public ClientSocketPool {
virtual LoadState GetLoadState(const std::string& group_name,
const ClientSocketHandle* handle) const;
- virtual Value* GetInfoAsValue(const std::string& name,
- const std::string& type) const {
- return base_.GetInfoAsValue(name, type);
- }
+ virtual DictionaryValue* GetInfoAsValue(const std::string& name,
+ const std::string& type,
+ bool include_nested_pools) const;
virtual base::TimeDelta ConnectionTimeout() const {
return base_.ConnectionTimeout();
@@ -186,6 +185,7 @@ class SOCKSClientSocketPool : public ClientSocketPool {
DISALLOW_COPY_AND_ASSIGN(SOCKSConnectJobFactory);
};
+ const scoped_refptr<TCPClientSocketPool> tcp_pool_;
PoolBase base_;
DISALLOW_COPY_AND_ASSIGN(SOCKSClientSocketPool);