Move ownership of Transport out of Session.

remoting/host/remoting_me2me_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.
 //
 // This file implements a standalone host process for Me2Me.
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 57 matching lines @@
 #include "remoting/host/single_window_desktop_environment.h"
 #include "remoting/host/switches.h"
 #include "remoting/host/third_party_auth_config.h"
 #include "remoting/host/token_validator_factory_impl.h"
 #include "remoting/host/usage_stats_consent.h"
 #include "remoting/host/username.h"
 #include "remoting/host/video_frame_recorder_host_extension.h"
 #include "remoting/protocol/authenticator.h"
 #include "remoting/protocol/channel_authenticator.h"
 #include "remoting/protocol/chromium_port_allocator.h"
-#include "remoting/protocol/ice_transport.h"
 #include "remoting/protocol/jingle_session_manager.h"
 #include "remoting/protocol/me2me_host_authenticator_factory.h"
 #include "remoting/protocol/network_settings.h"
 #include "remoting/protocol/pairing_registry.h"
 #include "remoting/protocol/port_range.h"
 #include "remoting/protocol/token_validator.h"
 #include "remoting/protocol/transport_context.h"
-#include "remoting/protocol/webrtc_transport.h"
 #include "remoting/signaling/push_notification_subscriber.h"
 #include "remoting/signaling/xmpp_signal_strategy.h"
 #include "third_party/webrtc/base/scoped_ref_ptr.h"
 
 #if defined(OS_POSIX)
 #include <signal.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include "base/file_descriptor_posix.h"
 #include "remoting/host/pam_authorization_factory_posix.h"
@@ skipping 776 matching lines @@
     remoting::AudioCapturerLinux::InitializePipeReader(
         context_->audio_task_runner(), audio_pipe_name);
   }
 
   base::FilePath gnubby_socket_name = base::CommandLine::ForCurrentProcess()->
       GetSwitchValuePath(kAuthSocknameSwitchName);
   if (!gnubby_socket_name.empty())
     remoting::GnubbyAuthHandler::SetGnubbySocketName(gnubby_socket_name);
 #endif  // defined(OS_LINUX)
 
+#if defined(NDEBUG)
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(kEnableWebrtc)) {
+    LOG(ERROR) << "WebRTC is enabled only in debug builds.";
+    ShutdownHost(kUsageExitCode);
+    return;
+  }
+#endif  // defined(NDEBUG)
+
   // Create a desktop environment factory appropriate to the build type &
   // platform.
 #if defined(OS_WIN)
   IpcDesktopEnvironmentFactory* desktop_environment_factory =
       new IpcDesktopEnvironmentFactory(
           context_->audio_task_runner(),
           context_->network_task_runner(),
           context_->video_capture_task_runner(),
           context_->network_task_runner(),
           daemon_channel_.get());
@@ skipping 602 matching lines @@
     network_settings.port_range.min_port = NetworkSettings::kDefaultMinPort;
     network_settings.port_range.max_port = NetworkSettings::kDefaultMaxPort;
   }
 
   scoped_refptr<protocol::TransportContext> transport_context =
       new protocol::TransportContext(
           signal_strategy_.get(),
           make_scoped_ptr(new protocol::ChromiumPortAllocatorFactory(
               context_->url_request_context_getter())),
           network_settings, protocol::TransportRole::SERVER);
-  scoped_ptr<protocol::TransportFactory> transport_factory;
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(kEnableWebrtc)) {
-#if !defined(NDEBUG)
-    jingle_glue::JingleThreadWrapper::EnsureForCurrentMessageLoop();
 
-    // The network thread is also used as worker thread for webrtc.
-    //
-    // TODO(sergeyu): Figure out if we would benefit from using a separate
-    // thread as a worker thread.
-    transport_factory.reset(new protocol::WebrtcTransportFactory(
-        jingle_glue::JingleThreadWrapper::current(), transport_context));
-#else  // !defined(NDEBUG)
-    LOG(ERROR) << "WebRTC is enabled only in debug builds.";
-    ShutdownHost(kUsageExitCode);
-    return;
-#endif  // defined(NDEBUG)
-  } else {
-    transport_factory.reset(
-        new protocol::IceTransportFactory(transport_context));
-  }
   scoped_ptr<protocol::SessionManager> session_manager(
-      new protocol::JingleSessionManager(std::move(transport_factory),
-                                         signal_strategy_.get()));
+      new protocol::JingleSessionManager(signal_strategy_.get()));
 
   scoped_ptr<protocol::CandidateSessionConfig> protocol_config =
       protocol::CandidateSessionConfig::CreateDefault();
   if (!desktop_environment_factory_->SupportsAudioCapture())
     protocol_config->DisableAudioChannel();
   if (enable_vp9_)
     protocol_config->set_vp9_experiment_enabled(true);
 #if !defined(NDEBUG)
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(kEnableWebrtc)) {
     protocol_config->set_webrtc_supported(true);
   }
 #endif  // !defined(NDEBUG)
   session_manager->set_protocol_config(std::move(protocol_config));
 
   host_.reset(new ChromotingHost(
       desktop_environment_factory_.get(), std::move(session_manager),
-      context_->audio_task_runner(), context_->input_task_runner(),
-      context_->video_capture_task_runner(),
+      transport_context, context_->audio_task_runner(),
+      context_->input_task_runner(), context_->video_capture_task_runner(),
       context_->video_encode_task_runner(), context_->network_task_runner(),
       context_->ui_task_runner()));
 
   if (frame_recorder_buffer_size_ > 0) {
     scoped_ptr<VideoFrameRecorderHostExtension> frame_recorder_extension(
         new VideoFrameRecorderHostExtension());
     frame_recorder_extension->SetMaxContentBytes(frame_recorder_buffer_size_);
     host_->AddExtension(std::move(frame_recorder_extension));
   }
 
@@ skipping 191 matching lines @@
       base::TimeDelta::FromSeconds(kShutdownTimeoutSeconds));
   new HostProcess(std::move(context), &exit_code, &shutdown_watchdog);
 
   // Run the main (also UI) message loop until the host no longer needs it.
   message_loop.Run();
 
   return exit_code;
 }
 
 }  // namespace remoting