More cleanups in JingleSessionManager interface.

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 1506 matching lines @@
 #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(transport_factory.Pass()));
+      new protocol::JingleSessionManager(transport_factory.Pass(),
+                                         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(protocol_config.Pass());
 
   host_.reset(new ChromotingHost(
-      signal_strategy_.get(), desktop_environment_factory_.get(),
+      desktop_environment_factory_.get(),
       session_manager.Pass(), 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(frame_recorder_extension.Pass());
@@ skipping 193 matching lines @@
       base::TimeDelta::FromSeconds(kShutdownTimeoutSeconds));
   new HostProcess(context.Pass(), &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