Use Authenticator interface in Session and SessionManager

remoting/protocol/pepper_session_manager.cc

 // 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.
 
 #include "remoting/protocol/pepper_session_manager.h"
 
 #include "base/bind.h"
 #include "remoting/jingle_glue/iq_sender.h"
 #include "remoting/jingle_glue/jingle_info_request.h"
 #include "remoting/jingle_glue/signal_strategy.h"
+#include "remoting/protocol/authenticator.h"
 #include "remoting/protocol/jingle_messages.h"
 #include "remoting/protocol/pepper_session.h"
 #include "third_party/libjingle/source/talk/base/socketaddress.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 
 using buzz::QName;
 
 namespace remoting {
 namespace protocol {
 
 PepperSessionManager::PepperSessionManager(pp::Instance* pp_instance)
     : pp_instance_(pp_instance),
       signal_strategy_(NULL),
       listener_(NULL),
       allow_nat_traversal_(false) {
 }
 
 PepperSessionManager::~PepperSessionManager() {
   Close();
 }
 
 void PepperSessionManager::Init(
     const std::string& local_jid,
     SignalStrategy* signal_strategy,
     SessionManager::Listener* listener,
-    crypto::RSAPrivateKey* private_key,
-    const std::string& certificate,
     bool allow_nat_traversal) {
   listener_ = listener;
   local_jid_ = local_jid;
   signal_strategy_ = signal_strategy;
   iq_sender_.reset(new IqSender(signal_strategy_));
-  private_key_.reset(private_key);
-  certificate_ = certificate;
   allow_nat_traversal_ = allow_nat_traversal;
 
   signal_strategy_->AddListener(this);
 
   // If NAT traversal is enabled then we need to request STUN/Relay info.
   if (allow_nat_traversal) {
     jingle_info_request_.reset(new JingleInfoRequest(signal_strategy_));
     jingle_info_request_->Send(base::Bind(&PepperSessionManager::OnJingleInfo,
                                           base::Unretained(this)));
   } else {
@@ skipping 14 matching lines @@
   transport_config_.relay_token = relay_token;
   VLOG(1) << "STUN server: " << transport_config_.stun_server
           << " Relay server: " << transport_config_.relay_server
           << " Relay token: " << transport_config_.relay_token;
 
   listener_->OnSessionManagerInitialized();
 }
 
 Session* PepperSessionManager::Connect(
     const std::string& host_jid,
-    const std::string& host_public_key,
-    const std::string& client_token,
+    Authenticator* authenticator,
     CandidateSessionConfig* config,
     const Session::StateChangeCallback& state_change_callback) {
   PepperSession* session = new PepperSession(this);
-  session->StartConnection(host_jid, host_public_key, client_token,
-                           config, state_change_callback);
+  session->StartConnection(host_jid, authenticator, config,
+                           state_change_callback);
   sessions_[session->session_id_] = session;
   return session;
 }
 
 void PepperSessionManager::Close() {
   DCHECK(CalledOnValidThread());
 
   // Close() can be called only after all sessions are destroyed.
   DCHECK(sessions_.empty());
 
   listener_ = NULL;
   jingle_info_request_.reset();
 
   signal_strategy_->RemoveListener(this);
 }
 
+void PepperSessionManager::set_authenticator_factory(
+    AuthenticatorFactory* authenticator_factory) {
+  DCHECK(CalledOnValidThread());
+  authenticator_factory_.reset(authenticator_factory);
+}
+
 bool PepperSessionManager::OnIncomingStanza(const buzz::XmlElement* stanza) {
   if (!JingleMessage::IsJingleMessage(stanza))
     return false;
 
   JingleMessage message;
   std::string error;
   if (!message.ParseXml(stanza, &error)) {
     SendReply(stanza, JingleMessageReply(JingleMessageReply::BAD_REQUEST));
     return true;
   }
@@ skipping 22 matching lines @@
   buzz::XmlElement* stanza = reply.ToXml(original_stanza);
   signal_strategy_->SendStanza(stanza);
 }
 
 void PepperSessionManager::SessionDestroyed(PepperSession* session) {
   sessions_.erase(session->session_id_);
 }
 
 }  // namespace protocol
 }  // namespace remoting