Move SSL layer initialization into ChannelAuthenticator implementations.

Also separate client and host authenticators into separate files.

Review URL: http://codereview.chromium.org/8604001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111311 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 22 deletions

diff --git a/remoting/protocol/jingle_stream_connector.h b/remoting/protocol/jingle_stream_connector.h
index 27103de..f37a691 100644
--- a/remoting/protocol/jingle_stream_connector.h
+++ b/remoting/protocol/jingle_stream_connector.h
@@ -41,24 +41,14 @@ class JingleStreamConnector : public JingleChannelConnector {
                         const Session::StreamChannelCallback& callback);
   virtual ~JingleStreamConnector();
 
-  // Starts connection process for the channel. |local_private_key| is
-  // owned by the caller, and must exist until this object is
-  // destroyed.
-  virtual void Connect(bool initiator,
-                       const std::string& local_cert,
-                       const std::string& remote_cert,
-                       crypto::RSAPrivateKey* local_private_key,
+  // JingleChannelConnector implementation.
+  virtual void Connect(ChannelAuthenticator* authenticator,
                        cricket::TransportChannel* raw_channel) OVERRIDE;
 
  private:
   bool EstablishTCPConnection(net::Socket* socket);
   void OnTCPConnect(int result);
-
-  bool EstablishSSLConnection();
-  void OnSSLConnect(int result);
-
-  void AuthenticateChannel();
-  void OnAuthenticationDone(ChannelAuthenticator::Result result);
+  void OnAuthenticationDone(net::Error error, net::StreamSocket* socket);
 
   void NotifyDone(net::StreamSocket* socket);
   void NotifyError();
@@ -67,23 +57,14 @@ class JingleStreamConnector : public JingleChannelConnector {
   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> 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);
 };