Move ownership of Transport out of Session.

remoting/host/chromoting_host.cc

 // Copyright (c) 2012 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/host/chromoting_host.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "build/build_config.h"
 #include "jingle/glue/thread_wrapper.h"
 #include "remoting/base/constants.h"
 #include "remoting/base/logging.h"
 #include "remoting/host/chromoting_host_context.h"
 #include "remoting/host/desktop_environment.h"
 #include "remoting/host/host_config.h"
 #include "remoting/host/input_injector.h"
 #include "remoting/host/video_frame_recorder.h"
 #include "remoting/protocol/client_stub.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/protocol/ice_connection_to_client.h"
 #include "remoting/protocol/input_stub.h"
+#include "remoting/protocol/transport_context.h"
 #include "remoting/protocol/webrtc_connection_to_client.h"
 
 using remoting::protocol::ConnectionToClient;
 using remoting::protocol::InputStub;
 
 namespace remoting {
 
 namespace {
 
 const net::BackoffEntry::Policy kDefaultBackoffPolicy = {
@@ skipping 20 matching lines @@
 
   // Don't use initial delay unless the last request was an error.
   false,
 };
 
 }  // namespace
 
 ChromotingHost::ChromotingHost(
     DesktopEnvironmentFactory* desktop_environment_factory,
     scoped_ptr<protocol::SessionManager> session_manager,
+    scoped_refptr<protocol::TransportContext> transport_context,
     scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
     : desktop_environment_factory_(desktop_environment_factory),
       session_manager_(std::move(session_manager)),
+      transport_context_(transport_context),
       audio_task_runner_(audio_task_runner),
       input_task_runner_(input_task_runner),
       video_capture_task_runner_(video_capture_task_runner),
       video_encode_task_runner_(video_encode_task_runner),
       network_task_runner_(network_task_runner),
       ui_task_runner_(ui_task_runner),
       started_(false),
       login_backoff_(&kDefaultBackoffPolicy),
       enable_curtaining_(false),
       weak_factory_(this) {
@@ skipping 180 matching lines @@
 
   *response = protocol::SessionManager::ACCEPT;
 
   HOST_LOG << "Client connected: " << session->jid();
 
   // Create either IceConnectionToClient or WebrtcConnectionToClient.
   // TODO(sergeyu): Move this logic to the protocol layer.
   scoped_ptr<protocol::ConnectionToClient> connection;
   if (session->config().protocol() ==
       protocol::SessionConfig::Protocol::WEBRTC) {
-    connection.reset(
-        new protocol::WebrtcConnectionToClient(make_scoped_ptr(session)));
+    connection.reset(new protocol::WebrtcConnectionToClient(
+        make_scoped_ptr(session), transport_context_));
   } else {
     connection.reset(new protocol::IceConnectionToClient(
-        make_scoped_ptr(session), video_encode_task_runner_));
+        make_scoped_ptr(session), transport_context_,
+        video_encode_task_runner_));
   }
 
   // Create a ClientSession object.
   ClientSession* client = new ClientSession(
       this, audio_task_runner_, input_task_runner_, video_capture_task_runner_,
       video_encode_task_runner_, network_task_runner_, ui_task_runner_,
       std::move(connection), desktop_environment_factory_,
       max_session_duration_, pairing_registry_, extensions_.get());
 
   clients_.push_back(client);
 }
 
 void ChromotingHost::DisconnectAllClients() {
   DCHECK(CalledOnValidThread());
 
   while (!clients_.empty()) {
     size_t size = clients_.size();
     clients_.front()->DisconnectSession(protocol::OK);
     CHECK_EQ(clients_.size(), size - 1);
   }
 }
 
 }  // namespace remoting