summaryrefslogtreecommitdiffstats
path: root/remoting/test/protocol_perftest.cc
diff options
context:
space:
mode:
authorsergeyu <sergeyu@chromium.org>2015-04-23 10:20:49 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-23 17:21:38 +0000
commit5a5854ee3e1c5760b422f26d31909bfb5dca631f (patch)
treea8a29175db6839ce5fe3326cb85931e857c78915 /remoting/test/protocol_perftest.cc
parent8431e8f39edd5d7bff793f446035207fee6dacd1 (diff)
downloadchromium_src-5a5854ee3e1c5760b422f26d31909bfb5dca631f.zip
chromium_src-5a5854ee3e1c5760b422f26d31909bfb5dca631f.tar.gz
chromium_src-5a5854ee3e1c5760b422f26d31909bfb5dca631f.tar.bz2
Use standard ICE in Chromoting.
Previously we were using legacy, non-standard version of ICE. This change adds ICE version negotiation and enabled standard ICE by default, when both peers support it. BUG=473758 Review URL: https://codereview.chromium.org/1085703003 Cr-Commit-Position: refs/heads/master@{#326560}
Diffstat (limited to 'remoting/test/protocol_perftest.cc')
-rw-r--r--remoting/test/protocol_perftest.cc10
1 files changed, 4 insertions, 6 deletions
diff --git a/remoting/test/protocol_perftest.cc b/remoting/test/protocol_perftest.cc
index 6401c46..6959edb 100644
--- a/remoting/test/protocol_perftest.cc
+++ b/remoting/test/protocol_perftest.cc
@@ -235,9 +235,8 @@ class ProtocolPerfTest
GetParam().out_of_order_rate);
scoped_ptr<protocol::TransportFactory> host_transport_factory(
new protocol::LibjingleTransportFactory(
- host_signaling_.get(),
- port_allocator.Pass(),
- network_settings));
+ host_signaling_.get(), port_allocator.Pass(), network_settings,
+ protocol::TransportRole::SERVER));
scoped_ptr<protocol::SessionManager> session_manager(
new protocol::JingleSessionManager(host_transport_factory.Pass()));
@@ -306,9 +305,8 @@ class ProtocolPerfTest
GetParam().out_of_order_rate);
scoped_ptr<protocol::TransportFactory> client_transport_factory(
new protocol::LibjingleTransportFactory(
- client_signaling_.get(),
- port_allocator.Pass(),
- network_settings));
+ client_signaling_.get(), port_allocator.Pass(), network_settings,
+ protocol::TransportRole::CLIENT));
std::vector<protocol::AuthenticationMethod> auth_methods;
auth_methods.push_back(protocol::AuthenticationMethod::Spake2(