Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(503)

Unified Diff: net/spdy/spdy_session.cc

Issue 10690122: Change SpdySession::GetSSLInfo to get the SSLInfo from the underlying socket (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: FIx curvercp Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/spdy/spdy_proxy_client_socket.cc ('k') | remoting/jingle_glue/ssl_socket_adapter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_session.cc
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index c127cdfccb395817d01a2b369b612f8175fc780a..d80904ee041e6fd0f7ca8437646fbbe6dd3600ed 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -1165,15 +1165,10 @@ scoped_refptr<SpdyStream> SpdySession::GetActivePushStream(
bool SpdySession::GetSSLInfo(SSLInfo* ssl_info,
bool* was_npn_negotiated,
NextProto* protocol_negotiated) {
- if (!is_secure_) {
- *protocol_negotiated = kProtoUnknown;
- return false;
- }
- SSLClientSocket* ssl_socket = GetSSLClientSocket();
- ssl_socket->GetSSLInfo(ssl_info);
- *was_npn_negotiated = ssl_socket->was_npn_negotiated();
- *protocol_negotiated = ssl_socket->GetNegotiatedProtocol();
- return true;
+
+ *was_npn_negotiated = connection_->socket()->WasNpnNegotiated();
+ *protocol_negotiated = connection_->socket()->GetNegotiatedProtocol();
+ return connection_->socket()->GetSSLInfo(ssl_info);
}
bool SpdySession::GetSSLCertRequestInfo(
« no previous file with comments | « net/spdy/spdy_proxy_client_socket.cc ('k') | remoting/jingle_glue/ssl_socket_adapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698