More cleanups in JingleSessionManager interface.

remoting/test/protocol_perftest.cc

 // Copyright 2014 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 "base/base64.h"
 #include "base/files/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/rand_util.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 221 matching lines @@
     port_allocator_factory->socket_factory()->SetLatency(
         GetParam().latency_average, GetParam().latency_stddev);
     port_allocator_factory->socket_factory()->set_out_of_order_rate(
         GetParam().out_of_order_rate);
     scoped_refptr<protocol::TransportContext> transport_context(
         new protocol::TransportContext(
             host_signaling_.get(), port_allocator_factory.Pass(),
             network_settings, protocol::TransportRole::SERVER));
 
     scoped_ptr<protocol::SessionManager> session_manager(
-        new protocol::JingleSessionManager(make_scoped_ptr(
-            new protocol::IceTransportFactory(transport_context))));
+        new protocol::JingleSessionManager(
+            make_scoped_ptr(
+                new protocol::IceTransportFactory(transport_context)),
+            host_signaling_.get()));
     session_manager->set_protocol_config(protocol_config_->Clone());
 
     // Encoder runs on a separate thread, main thread is used for everything
     // else.
-    host_.reset(new ChromotingHost(host_signaling_.get(),
-                                   &desktop_environment_factory_,
+    host_.reset(new ChromotingHost(&desktop_environment_factory_,
                                    session_manager.Pass(),
                                    host_thread_.task_runner(),
                                    host_thread_.task_runner(),
                                    capture_thread_.task_runner(),
                                    encode_thread_.task_runner(),
                                    host_thread_.task_runner(),
                                    host_thread_.task_runner()));
 
     base::FilePath certs_dir(net::GetTestCertsDirectory());
 
@@ skipping 226 matching lines @@
               << "ms Encode: " << last_video_packet_->encode_time_ms()
               << "ms Capture: " << last_video_packet_->capture_time_ms()
               << "ms";
     sum += latency;
   }
 
   LOG(INFO) << "Average: " << (sum / kFrames).InMillisecondsF();
 }
 
 }  // namespace remoting