From 33661e48840aaf44b3efe090b3e947ef83f67a0a Mon Sep 17 00:00:00 2001 From: "rch@chromium.org" Date: Tue, 3 Apr 2012 16:16:26 +0000 Subject: Add a new GetNegotiatedProtocol method to StreamSocket and implement in all subclasses. BUG=120890 Review URL: https://chromiumcodereview.appspot.com/9958028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130388 0039d316-1c4b-4281-b951-d872f2087c98 --- net/spdy/spdy_session.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'net/spdy/spdy_session.cc') diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc index 3815357..203f328 100644 --- a/net/spdy/spdy_session.cc +++ b/net/spdy/spdy_session.cc @@ -438,7 +438,7 @@ net::Error SpdySession::InitializeWithSocket( NextProto protocol = g_default_protocol; if (is_secure_) { SSLClientSocket* ssl_socket = GetSSLClientSocket(); - NextProto protocol_negotiated = ssl_socket->protocol_negotiated(); + NextProto protocol_negotiated = ssl_socket->GetNegotiatedProtocol(); if (protocol_negotiated != kProtoUnknown) { protocol = protocol_negotiated; } @@ -633,7 +633,7 @@ bool SpdySession::NeedsCredentials() const { if (!is_secure_) return false; SSLClientSocket* ssl_socket = GetSSLClientSocket(); - if (ssl_socket->protocol_negotiated() < kProtoSPDY3) + if (ssl_socket->GetNegotiatedProtocol() < kProtoSPDY3) return false; return ssl_socket->WasDomainBoundCertSent(); } @@ -1187,7 +1187,7 @@ Value* SpdySession::GetInfoAsValue() const { NextProto proto = kProtoUnknown; if (is_secure_) { - proto = GetSSLClientSocket()->protocol_negotiated(); + proto = GetSSLClientSocket()->GetNegotiatedProtocol(); } dict->SetString("protocol_negotiated", SSLClientSocket::NextProtoToString(proto)); @@ -1307,7 +1307,7 @@ bool SpdySession::GetSSLInfo(SSLInfo* ssl_info, SSLClientSocket* ssl_socket = GetSSLClientSocket(); ssl_socket->GetSSLInfo(ssl_info); *was_npn_negotiated = ssl_socket->was_npn_negotiated(); - *protocol_negotiated = ssl_socket->protocol_negotiated(); + *protocol_negotiated = ssl_socket->GetNegotiatedProtocol(); return true; } -- cgit v1.1