| Index: net/socket/ssl_client_socket_pool.h
|
| diff --git a/net/socket/ssl_client_socket_pool.h b/net/socket/ssl_client_socket_pool.h
|
| index bd667ff86aef9cf7cf4a768d31e0004f5be47511..03bdf94607591836259dd69135aee3c0203a199b 100644
|
| --- a/net/socket/ssl_client_socket_pool.h
|
| +++ b/net/socket/ssl_client_socket_pool.h
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -166,6 +166,7 @@ class SSLConnectJob : public ConnectJob {
|
|
|
| class NET_EXPORT_PRIVATE SSLClientSocketPool
|
| : public ClientSocketPool,
|
| + public LayeredPool,
|
| public SSLConfigService::Observer {
|
| public:
|
| // Only the pools that will be used are required. i.e. if you never
|
| @@ -211,6 +212,8 @@ class NET_EXPORT_PRIVATE SSLClientSocketPool
|
|
|
| virtual void Flush() OVERRIDE;
|
|
|
| + virtual bool IsStalled() const OVERRIDE;
|
| +
|
| virtual void CloseIdleSockets() OVERRIDE;
|
|
|
| virtual int IdleSocketCount() const OVERRIDE;
|
| @@ -222,6 +225,10 @@ class NET_EXPORT_PRIVATE SSLClientSocketPool
|
| const std::string& group_name,
|
| const ClientSocketHandle* handle) const OVERRIDE;
|
|
|
| + virtual void AddLayeredPool(LayeredPool* layered_pool) OVERRIDE;
|
| +
|
| + virtual void RemoveLayeredPool(LayeredPool* layered_pool) OVERRIDE;
|
| +
|
| virtual base::DictionaryValue* GetInfoAsValue(
|
| const std::string& name,
|
| const std::string& type,
|
| @@ -231,6 +238,9 @@ class NET_EXPORT_PRIVATE SSLClientSocketPool
|
|
|
| virtual ClientSocketPoolHistograms* histograms() const OVERRIDE;
|
|
|
| + // LayeredPool implementation.
|
| + virtual bool CloseOneIdleConnection() OVERRIDE;
|
| +
|
| private:
|
| typedef ClientSocketPoolBase<SSLSocketParams> PoolBase;
|
|
|
|
|