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

Side by Side Diff: remoting/test/protocol_perftest.cc

Issue 1800893002: Enable TURN on the host when using WebRTC. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <utility> 5 #include <utility>
6 6
7 #include "base/base64.h" 7 #include "base/base64.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 host_signaling_.get(), std::move(port_allocator_factory), nullptr, 326 host_signaling_.get(), std::move(port_allocator_factory), nullptr,
327 network_settings, protocol::TransportRole::SERVER)); 327 network_settings, protocol::TransportRole::SERVER));
328 scoped_ptr<protocol::SessionManager> session_manager( 328 scoped_ptr<protocol::SessionManager> session_manager(
329 new protocol::JingleSessionManager(host_signaling_.get())); 329 new protocol::JingleSessionManager(host_signaling_.get()));
330 session_manager->set_protocol_config(protocol_config_->Clone()); 330 session_manager->set_protocol_config(protocol_config_->Clone());
331 331
332 // Encoder runs on a separate thread, main thread is used for everything 332 // Encoder runs on a separate thread, main thread is used for everything
333 // else. 333 // else.
334 host_.reset(new ChromotingHost( 334 host_.reset(new ChromotingHost(
335 &desktop_environment_factory_, std::move(session_manager), 335 &desktop_environment_factory_, std::move(session_manager),
336 transport_context, host_thread_.task_runner(), 336 transport_context, transport_context, host_thread_.task_runner(),
garykac 2016/03/15 00:13:16 Shouldn't there be separate ice_ and _webrtc_ tran
Sergey Ulanov 2016/03/15 20:17:31 Reverted this. There is no reason to use a differe
337 encode_thread_.task_runner())); 337 encode_thread_.task_runner()));
338 338
339 base::FilePath certs_dir(net::GetTestCertsDirectory()); 339 base::FilePath certs_dir(net::GetTestCertsDirectory());
340 340
341 std::string host_cert; 341 std::string host_cert;
342 ASSERT_TRUE(base::ReadFileToString( 342 ASSERT_TRUE(base::ReadFileToString(
343 certs_dir.AppendASCII("unittest.selfsigned.der"), &host_cert)); 343 certs_dir.AppendASCII("unittest.selfsigned.der"), &host_cert));
344 344
345 base::FilePath key_path = certs_dir.AppendASCII("unittest.key.bin"); 345 base::FilePath key_path = certs_dir.AppendASCII("unittest.key.bin");
346 std::string key_string; 346 std::string key_string;
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
627 627
628 TEST_P(ProtocolPerfTest, TotalLatencyIce) { 628 TEST_P(ProtocolPerfTest, TotalLatencyIce) {
629 MeasureTotalLatency(false); 629 MeasureTotalLatency(false);
630 } 630 }
631 631
632 TEST_P(ProtocolPerfTest, TotalLatencyWebrtc) { 632 TEST_P(ProtocolPerfTest, TotalLatencyWebrtc) {
633 MeasureTotalLatency(true); 633 MeasureTotalLatency(true);
634 } 634 }
635 635
636 } // namespace remoting 636 } // namespace remoting
OLDNEW
« remoting/host/it2me/it2me_host.cc ('K') | « remoting/host/remoting_me2me_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698