Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(604)

Unified Diff: remoting/test/protocol_perftest.cc

Issue 1545743002: Move ownership of Transport out of Session. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_not_pass_client
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/test/protocol_perftest.cc
diff --git a/remoting/test/protocol_perftest.cc b/remoting/test/protocol_perftest.cc
index 41529a907f5c5e22046137a5f8d9e9c853ef7be3..5d0f18bf9ab8471bc8a80990eb9471b800535f00 100644
--- a/remoting/test/protocol_perftest.cc
+++ b/remoting/test/protocol_perftest.cc
@@ -22,7 +22,6 @@
#include "remoting/host/chromoting_host.h"
#include "remoting/host/chromoting_host_context.h"
#include "remoting/host/fake_desktop_environment.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/negotiating_client_authenticator.h"
@@ -237,21 +236,18 @@ class ProtocolPerfTest
new protocol::TransportContext(
host_signaling_.get(), std::move(port_allocator_factory),
network_settings, protocol::TransportRole::SERVER));
-
scoped_ptr<protocol::SessionManager> session_manager(
- new protocol::JingleSessionManager(
- make_scoped_ptr(
- new protocol::IceTransportFactory(transport_context)),
- host_signaling_.get()));
+ new protocol::JingleSessionManager(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(
&desktop_environment_factory_, std::move(session_manager),
- host_thread_.task_runner(), host_thread_.task_runner(),
- capture_thread_.task_runner(), encode_thread_.task_runner(),
- host_thread_.task_runner(), host_thread_.task_runner()));
+ transport_context, 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());
« remoting/protocol/session.h ('K') | « remoting/protocol/webrtc_transport_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698