More cleanups in JingleSessionManager interface.

remoting/protocol/connection_to_host_impl.cc

 // Copyright 2015 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/connection_to_host_impl.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "remoting/base/constants.h"
@@ skipping 76 matching lines @@
   event_callback_ = event_callback;
   authenticator_ = authenticator.Pass();
 
   // Save jid of the host. The actual connection is created later after
   // |signal_strategy_| is connected.
   host_jid_ = host_jid;
 
   signal_strategy_->AddListener(this);
 
   session_manager_.reset(new JingleSessionManager(
-      make_scoped_ptr(new IceTransportFactory(transport_context))));
+      make_scoped_ptr(new IceTransportFactory(transport_context)),
+      signal_strategy));
   session_manager_->set_protocol_config(candidate_config_->Clone());
-  session_manager_->Init(signal_strategy_, this);
 
   SetState(CONNECTING, OK);
 
   switch (signal_strategy_->GetState()) {
     case SignalStrategy::CONNECTING:
       // Nothing to do here. Just need to wait until |signal_strategy_| becomes
       // connected.
       break;
     case SignalStrategy::CONNECTED:
       StartSession();
@@ skipping 71 matching lines @@
     VLOG(1) << "Connection closed.";
     CloseOnError(SIGNALING_ERROR);
   }
 }
 
 bool ConnectionToHostImpl::OnSignalStrategyIncomingStanza(
     const buzz::XmlElement* stanza) {
   return false;
 }
 
-void ConnectionToHostImpl::OnIncomingSession(
-    Session* session,
-    SessionManager::IncomingSessionResponse* response) {
-  DCHECK(CalledOnValidThread());
-  // Client always rejects incoming sessions.
-  *response = SessionManager::DECLINE;
-}
-
 void ConnectionToHostImpl::OnSessionStateChange(Session::State state) {
   DCHECK(CalledOnValidThread());
   DCHECK(event_callback_);
 
   switch (state) {
     case Session::INITIALIZING:
     case Session::CONNECTING:
     case Session::ACCEPTING:
     case Session::ACCEPTED:
     case Session::AUTHENTICATING:
@@ skipping 117 matching lines @@
 
   if (state != state_) {
     state_ = state;
     error_ = error;
     event_callback_->OnConnectionState(state_, error_);
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting