More cleanups in JingleSessionManager interface.

remoting/host/it2me/it2me_host.cc

 // Copyright 2013 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/it2me/it2me_host.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/strings/string_util.h"
 #include "base/threading/platform_thread.h"
@@ skipping 221 matching lines @@
   }
 
   scoped_ptr<protocol::TransportFactory> transport_factory(
       new protocol::IceTransportFactory(new protocol::TransportContext(
           signal_strategy_.get(),
           make_scoped_ptr(new protocol::ChromiumPortAllocatorFactory(
               host_context_->url_request_context_getter())),
           network_settings, protocol::TransportRole::SERVER)));
 
   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();
   // Disable audio by default.
   // TODO(sergeyu): Add UI to enable it.
   protocol_config->DisableAudioChannel();
   session_manager->set_protocol_config(protocol_config.Pass());
 
   // Create the host.
   host_.reset(new ChromotingHost(
-      signal_strategy_.get(), desktop_environment_factory_.get(),
+      desktop_environment_factory_.get(),
       session_manager.Pass(), host_context_->audio_task_runner(),
       host_context_->input_task_runner(),
       host_context_->video_capture_task_runner(),
       host_context_->video_encode_task_runner(),
       host_context_->network_task_runner(), host_context_->ui_task_runner()));
   host_->AddStatusObserver(this);
   host_status_logger_.reset(
       new HostStatusLogger(host_->AsWeakPtr(), ServerLogEntry::IT2ME,
                            signal_strategy_.get(), directory_bot_jid_));
 
@@ skipping 224 matching lines @@
   scoped_ptr<It2MeConfirmationDialogFactory> confirmation_dialog_factory(
       new It2MeConfirmationDialogFactory());
   scoped_ptr<PolicyWatcher> policy_watcher =
       PolicyWatcher::Create(policy_service_, context->file_task_runner());
   return new It2MeHost(context.Pass(), policy_watcher.Pass(),
                        confirmation_dialog_factory.Pass(),
                        observer, xmpp_server_config, directory_bot_jid);
 }
 
 }  // namespace remoting