Refactor ChannelAuthenticator so that it can be used with Authenticator.

remoting/protocol/jingle_stream_connector.h

 // Copyright (c) 2011 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 REMOTING_PROTOCOL_JINGLE_STREAM_CONNECTOR_H_
 #define REMOTING_PROTOCOL_JINGLE_STREAM_CONNECTOR_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "net/base/completion_callback.h"
 #include "remoting/protocol/channel_authenticator.h"
 #include "remoting/protocol/jingle_channel_connector.h"
 #include "remoting/protocol/session.h"
 
 namespace cricket {
 class TransportChannel;
 }  // namespace cricket
 
 namespace jingle_glue {
 class TransportChannelSocketAdapter;
 }  // namespace jingle_glue
 
 namespace net {
 class CertVerifier;
 class StreamSocket;
-class SSLClientSocket;
-class SSLServerSocket;
+class SSLSocket;
 }  // namespace net
 
 namespace remoting {
 namespace protocol {
 
 class JingleSession;
 
 // JingleStreamConnector creates the named datagram channel in the supplied
 // JingleSession, and uses PseudoTcp to turn it into a stream channel.  Within
 // the stream channel SSL is used to secure the protocol stream.  Finally, the
@@ skipping 32 matching lines @@
   JingleSession* session_;
   std::string name_;
   Session::StreamChannelCallback callback_;
 
   bool initiator_;
   std::string local_cert_;
   std::string remote_cert_;
   crypto::RSAPrivateKey* local_private_key_;
 
   cricket::TransportChannel* raw_channel_;
-  scoped_ptr<net::StreamSocket> socket_;
-
-  // TODO(wez): Ugly up-casts needed so we can fetch SSL keying material.
-  net::SSLClientSocket* ssl_client_socket_;
-  net::SSLServerSocket* ssl_server_socket_;
+  scoped_ptr<net::StreamSocket> tcp_socket_;
+  scoped_ptr<net::SSLSocket> socket_;
 
   // Used to verify the certificate received in SSLClientSocket.
   scoped_ptr<net::CertVerifier> cert_verifier_;
 
   scoped_ptr<ChannelAuthenticator> authenticator_;
 
   // Callback called by the TCP and SSL layers.
   net::OldCompletionCallbackImpl<JingleStreamConnector> tcp_connect_callback_;
   net::OldCompletionCallbackImpl<JingleStreamConnector> ssl_connect_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(JingleStreamConnector);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_JINGLE_STREAM_CONNECTOR_H_