Index: net/socket/socket_test_util.cc |
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc |
index 3498c13428d26ee04ff61c04387ecf3b5a946eec..1068b88df9ec97b024d3ee91b7e044cfe9c221cc 100644 |
--- a/net/socket/socket_test_util.cc |
+++ b/net/socket/socket_test_util.cc |
@@ -764,6 +764,11 @@ const BoundNetLog& MockClientSocket::NetLog() const { |
return net_log_; |
} |
+std::string MockClientSocket::GetSessionCacheKey() const { |
+ NOTREACHED(); |
wtc
2014/08/12 14:51:00
Nit: use NOTIMPLEMENTED() instead, to match the ot
mshelley
2014/08/12 21:47:00
Done.
|
+ return std::string(); |
+} |
+ |
bool MockClientSocket::InSessionCache() const { |
NOTIMPLEMENTED(); |
return false; |
@@ -1327,6 +1332,7 @@ MockSSLClientSocket::MockSSLClientSocket( |
new_npn_value_(false), |
is_protocol_negotiated_set_(false), |
protocol_negotiated_(kProtoUnknown), |
+ host_port_pair_(host_port_pair), |
next_connect_state_(STATE_NONE), |
reached_connect_(false), |
weak_factory_(this) { |
@@ -1389,6 +1395,12 @@ bool MockSSLClientSocket::GetSSLInfo(SSLInfo* ssl_info) { |
return true; |
} |
+std::string MockSSLClientSocket::GetSessionCacheKey() const { |
+ // For the purposes of these tests, |host_and_port| will serve as the |
+ // cache key. |
+ return host_port_pair_.ToString(); |
+} |
+ |
bool MockSSLClientSocket::InSessionCache() const { |
return data_->is_in_session_cache; |
} |