Change SpdySession::GetSSLInfo to get the SSLInfo from the underlying socket

net/socket/ssl_client_socket.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_H_
 #define NET_SOCKET_SSL_CLIENT_SOCKET_H_
 #pragma once
 
 #include <string>
 
@@ skipping 52 matching lines @@
   // connection.
   enum NextProtoStatus {
     // WARNING: These values are serialized to disk. Don't change them.
 
     kNextProtoUnsupported = 0,  // The server doesn't support NPN.
     kNextProtoNegotiated = 1,   // We agreed on a protocol.
     kNextProtoNoOverlap = 2,    // No protocols in common. We requested
                                 // the first protocol in our list.
   };
 
-  // Gets the SSL connection information of the socket.
-  //
-  // TODO(sergeyu): Move this method to the SSLSocket interface and
-  // implemented in SSLServerSocket too.
-  virtual void GetSSLInfo(SSLInfo* ssl_info) = 0;
-
   // Gets the SSL CertificateRequest info of the socket after Connect failed
   // with ERR_SSL_CLIENT_AUTH_CERT_NEEDED.
   virtual void GetSSLCertRequestInfo(
       SSLCertRequestInfo* cert_request_info) = 0;
 
   // StreamSocket:
+  virtual bool WasNpnNegotiated() const OVERRIDE;

[Ryan Sleevi, 2012/07/11 22:50:43]

Move 78+79 to 72

Put the interface implementations before this classes implementation

[Ryan Hamilton, 2012/07/11 23:37:25]

Done.

+
   virtual NextProto GetNegotiatedProtocol() const OVERRIDE;
 
   // Get the application level protocol that we negotiated with the server.
   // *proto is set to the resulting protocol (n.b. that the string may have
   // embedded NULs).
   //   kNextProtoUnsupported: *proto is cleared.
   //   kNextProtoNegotiated:  *proto is set to the negotiated protocol.
   //   kNextProtoNoOverlap:   *proto is set to the first protocol in the
   //                          supported list.
   // *server_protos is set to the server advertised protocols.
   virtual NextProtoStatus GetNextProto(std::string* proto,
                                        std::string* server_protos) = 0;
 
   static NextProto NextProtoFromString(const std::string& proto_string);
 
   static const char* NextProtoToString(NextProto next_proto);
 
   static const char* NextProtoStatusToString(const NextProtoStatus status);
 
   // Can be used with the second argument(|server_protos|) of |GetNextProto| to
   // construct a comma separated string of server advertised protocols.
   static std::string ServerProtosToString(const std::string& server_protos);
 
   static bool IgnoreCertError(int error, int load_flags);
 
   // ClearSessionCache clears the SSL session cache, used to resume SSL
   // sessions.
   static void ClearSessionCache();
 
   virtual bool was_npn_negotiated() const;

[Ryan Sleevi, 2012/07/11 22:50:43]

How is this different than WasNpnNegotiated?

[Ryan Hamilton, 2012/07/11 23:37:25]

*whistles innocently*

Done. :>

 
   virtual bool set_was_npn_negotiated(bool negotiated);
 
   virtual bool was_spdy_negotiated() const;
 
   virtual bool set_was_spdy_negotiated(bool negotiated);
 
   virtual void set_protocol_negotiated(NextProto protocol_negotiated);
 
   // Returns the ServerBoundCertService used by this socket, or NULL if
@@ skipping 15 matching lines @@
   bool was_spdy_negotiated_;
   // Protocol that we negotiated with the server.
   NextProto protocol_negotiated_;
   // True if a channel ID was sent.
   bool channel_id_sent_;
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_SSL_CLIENT_SOCKET_H_