diff options
| author | davidben <davidben@chromium.org> | 2015-04-27 10:52:48 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-27 17:52:51 +0000 |
| commit | 6974bf71b37bddb36ca8b1feefc013b7c47c105f (patch) | |
| tree | 818649dadfd3ff00ec48def364bbb197536cbc55 /chrome | |
| parent | ceb2fff7aa06959511e021778b11b76704f45429 (diff) | |
| download | chromium_src-6974bf71b37bddb36ca8b1feefc013b7c47c105f.zip chromium_src-6974bf71b37bddb36ca8b1feefc013b7c47c105f.tar.gz chromium_src-6974bf71b37bddb36ca8b1feefc013b7c47c105f.tar.bz2 | |
Clean up NPN/ALPN-related SSLClientSocket bits.
A follow-up will unvirtual and disentangle the other virtual functions there.
Have SSLClientSocket implement ALPN-related methods internally using
GetNextProto rather than rely on SSLConnectJob to do it.
The SPDY-related bit is removed and moved up to callers. Also clean up the
MockSSLClientSocket overrides of these functions now that the setters are never
called outside of the SSLClientSocket implementation. Instead,
SSLSocketDataProvider supplies the input to MockSSLClientSocket::GetNextProto
and then the usual logic computes everything else from there.
BUG=477847
Review URL: https://codereview.chromium.org/1097773003
Cr-Commit-Position: refs/heads/master@{#327066}
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/extensions/api/socket/tls_socket_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/api/socket/tls_socket_unittest.cc b/chrome/browser/extensions/api/socket/tls_socket_unittest.cc index 57cd0ea..adebfbf 100644 --- a/chrome/browser/extensions/api/socket/tls_socket_unittest.cc +++ b/chrome/browser/extensions/api/socket/tls_socket_unittest.cc @@ -61,8 +61,8 @@ class MockSSLClientSocket : public net::SSLClientSocket { unsigned int)); MOCK_METHOD1(GetTLSUniqueChannelBinding, int(std::string*)); MOCK_METHOD1(GetSSLCertRequestInfo, void(net::SSLCertRequestInfo*)); - MOCK_METHOD1(GetNextProto, - net::SSLClientSocket::NextProtoStatus(std::string*)); + MOCK_CONST_METHOD1(GetNextProto, + net::SSLClientSocket::NextProtoStatus(std::string*)); MOCK_CONST_METHOD0(GetUnverifiedServerCertificateChain, scoped_refptr<net::X509Certificate>()); MOCK_CONST_METHOD0(GetChannelIDService, net::ChannelIDService*()); |