Move ownership of Transport out of Session.

remoting/protocol/ice_connection_to_host.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/ice_connection_to_host.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "remoting/base/constants.h"
 #include "remoting/protocol/audio_reader.h"
 #include "remoting/protocol/audio_stub.h"
 #include "remoting/protocol/auth_util.h"
 #include "remoting/protocol/client_control_dispatcher.h"
 #include "remoting/protocol/client_event_dispatcher.h"
 #include "remoting/protocol/client_stub.h"
 #include "remoting/protocol/client_video_dispatcher.h"
 #include "remoting/protocol/clipboard_stub.h"
 #include "remoting/protocol/errors.h"
 #include "remoting/protocol/ice_transport.h"
-#include "remoting/protocol/transport.h"
+#include "remoting/protocol/transport_context.h"
 #include "remoting/protocol/video_stub.h"
 
 namespace remoting {
 namespace protocol {
 
 IceConnectionToHost::IceConnectionToHost() {}
 IceConnectionToHost::~IceConnectionToHost() {}
 
-void IceConnectionToHost::Connect(scoped_ptr<Session> session,
-                                  HostEventCallback* event_callback) {
+void IceConnectionToHost::Connect(
+    scoped_ptr<Session> session,
+    scoped_refptr<TransportContext> transport_context,
+    HostEventCallback* event_callback) {
   DCHECK(client_stub_);
   DCHECK(clipboard_stub_);
   DCHECK(monitored_video_stub_);
 
+  transport_.reset(new IceTransport(transport_context, this));
+
   session_ = std::move(session);
   session_->SetEventHandler(this);
+  session_->SetTransport(transport_.get());
 
   event_callback_ = event_callback;
 
   SetState(CONNECTING, OK);
 }
 
 const SessionConfig& IceConnectionToHost::config() {
   return session_->config();
 }
 
@@ skipping 34 matching lines @@
 void IceConnectionToHost::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:
-    case Session::CONNECTED:
       // Don't care about these events.
       break;
 
     case Session::AUTHENTICATED:
       SetState(AUTHENTICATED, OK);
-
       control_dispatcher_.reset(new ClientControlDispatcher());
-      control_dispatcher_->Init(
-          session_->GetTransport()->GetMultiplexedChannelFactory(), this);
+      control_dispatcher_->Init(transport_->GetMultiplexedChannelFactory(),
+                                this);
       control_dispatcher_->set_client_stub(client_stub_);
       control_dispatcher_->set_clipboard_stub(clipboard_stub_);
 
       event_dispatcher_.reset(new ClientEventDispatcher());
-      event_dispatcher_->Init(
-          session_->GetTransport()->GetMultiplexedChannelFactory(), this);
+      event_dispatcher_->Init(transport_->GetMultiplexedChannelFactory(), this);
 
       video_dispatcher_.reset(
           new ClientVideoDispatcher(monitored_video_stub_.get()));
-      video_dispatcher_->Init(
-          session_->GetTransport()->GetStreamChannelFactory(), this);
+      video_dispatcher_->Init(transport_->GetStreamChannelFactory(), this);
 
       if (session_->config().is_audio_enabled()) {
         audio_reader_.reset(new AudioReader(audio_stub_));
-        audio_reader_->Init(
-            session_->GetTransport()->GetMultiplexedChannelFactory(), this);
+        audio_reader_->Init(transport_->GetMultiplexedChannelFactory(), this);
       }
       break;
 
     case Session::CLOSED:
       CloseChannels();
       SetState(CLOSED, OK);
       break;
 
     case Session::FAILED:
       // If we were connected then treat signaling timeout error as if
       // the connection was closed by the peer.
       //
       // TODO(sergeyu): This logic belongs to the webapp, but we
       // currently don't expose this error code to the webapp, and it
       // would be hard to add it because client plugin and webapp
       // versions may not be in sync. It should be easy to do after we
       // are finished moving the client plugin to NaCl.
       if (state_ == CONNECTED && session_->error() == SIGNALING_TIMEOUT) {
         CloseChannels();
         SetState(CLOSED, OK);
       } else {
         CloseOnError(session_->error());
       }
       break;
   }
 }
 
-void IceConnectionToHost::OnSessionRouteChange(const std::string& channel_name,
-                                               const TransportRoute& route) {
+void IceConnectionToHost::OnIceTransportRouteChange(
+    const std::string& channel_name,
+    const TransportRoute& route) {
   event_callback_->OnRouteChanged(channel_name, route);
 }
 
+void IceConnectionToHost::OnIceTransportError(ErrorCode error) {
+  session_->Close(error);
+}
+
 void IceConnectionToHost::OnChannelInitialized(
     ChannelDispatcherBase* channel_dispatcher) {
   NotifyIfChannelsReady();
 }
 
 void IceConnectionToHost::OnChannelError(
     ChannelDispatcherBase* channel_dispatcher,
     ErrorCode error) {
-  LOG(ERROR) << "Failed to connect channel " << channel_dispatcher;
+  LOG(ERROR) << "Failed to connect channel "
+             << channel_dispatcher->channel_name();
   CloseOnError(CHANNEL_CONNECTION_ERROR);
-  return;
 }
 
 void IceConnectionToHost::OnVideoChannelStatus(bool active) {
   event_callback_->OnConnectionReady(active);
 }
 
 ConnectionToHost::State IceConnectionToHost::state() const {
   return state_;
 }
 
@@ skipping 38 matching lines @@
 
   if (state != state_) {
     state_ = state;
     error_ = error;
     event_callback_->OnConnectionState(state_, error_);
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting