| Index: net/socket/ssl_client_socket_openssl.cc
|
| diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc
|
| index 09f36c8dfa6451812190d74d376fa242f10b35d9..16ef7e067cd92f0817d12655f32c613fc1f30617 100644
|
| --- a/net/socket/ssl_client_socket_openssl.cc
|
| +++ b/net/socket/ssl_client_socket_openssl.cc
|
| @@ -369,6 +369,13 @@ SSLClientSocketOpenSSL::~SSLClientSocketOpenSSL() {
|
| Disconnect();
|
| }
|
|
|
| +std::string SSLClientSocketOpenSSL::GetSessionCacheKey() const {
|
| + std::string result = host_and_port_.ToString();
|
| + result.append("/");
|
| + result.append(ssl_session_cache_shard_);
|
| + return result;
|
| +}
|
| +
|
| bool SSLClientSocketOpenSSL::InSessionCache() const {
|
| SSLContext* context = SSLContext::GetInstance();
|
| std::string cache_key = GetSessionCacheKey();
|
| @@ -840,10 +847,6 @@ void SSLClientSocketOpenSSL::DoWriteCallback(int rv) {
|
| base::ResetAndReturn(&user_write_callback_).Run(rv);
|
| }
|
|
|
| -std::string SSLClientSocketOpenSSL::GetSessionCacheKey() const {
|
| - return CreateSessionCacheKey(host_and_port_, ssl_session_cache_shard_);
|
| -}
|
| -
|
| void SSLClientSocketOpenSSL::OnHandshakeCompletion() {
|
| if (!handshake_completion_callback_.is_null())
|
| base::ResetAndReturn(&handshake_completion_callback_).Run();
|
|
|