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

Side by Side Diff: webrtc/pc/peerconnectioninterface_unittest.cc

Issue 2815513012: Negotiate the same SRTP crypto suites for every DTLS association formed. (Closed)
Patch Set: Merge with master Created 3 years, 8 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
« no previous file with comments | « webrtc/pc/peerconnectionfactory.cc ('k') | webrtc/pc/test/mock_webrtcsession.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 644 matching lines...) Expand 10 before | Expand all | Expand 10 after
655 PeerConnectionFactory::CreateMediaController(config, event_log); 655 PeerConnectionFactory::CreateMediaController(config, event_log);
656 EXPECT_TRUE(mc != nullptr); 656 EXPECT_TRUE(mc != nullptr);
657 return mc; 657 return mc;
658 } 658 }
659 659
660 cricket::TransportController* CreateTransportController( 660 cricket::TransportController* CreateTransportController(
661 cricket::PortAllocator* port_allocator, 661 cricket::PortAllocator* port_allocator,
662 bool redetermine_role_on_ice_restart) override { 662 bool redetermine_role_on_ice_restart) override {
663 transport_controller = new cricket::TransportController( 663 transport_controller = new cricket::TransportController(
664 rtc::Thread::Current(), rtc::Thread::Current(), port_allocator, 664 rtc::Thread::Current(), rtc::Thread::Current(), port_allocator,
665 redetermine_role_on_ice_restart); 665 redetermine_role_on_ice_restart, rtc::CryptoOptions());
666 return transport_controller; 666 return transport_controller;
667 } 667 }
668 668
669 cricket::TransportController* transport_controller; 669 cricket::TransportController* transport_controller;
670 // Mutable, so they can be modified in the above const-declared method. 670 // Mutable, so they can be modified in the above const-declared method.
671 mutable bool create_media_controller_called_ = false; 671 mutable bool create_media_controller_called_ = false;
672 mutable cricket::MediaConfig create_media_controller_config_; 672 mutable cricket::MediaConfig create_media_controller_config_;
673 }; 673 };
674 674
675 class PeerConnectionInterfaceTest : public testing::Test { 675 class PeerConnectionInterfaceTest : public testing::Test {
(...skipping 2923 matching lines...) Expand 10 before | Expand all | Expand 10 after
3599 EXPECT_NE(a, f); 3599 EXPECT_NE(a, f);
3600 3600
3601 PeerConnectionInterface::RTCConfiguration g; 3601 PeerConnectionInterface::RTCConfiguration g;
3602 g.disable_ipv6 = true; 3602 g.disable_ipv6 = true;
3603 EXPECT_NE(a, g); 3603 EXPECT_NE(a, g);
3604 3604
3605 PeerConnectionInterface::RTCConfiguration h( 3605 PeerConnectionInterface::RTCConfiguration h(
3606 PeerConnectionInterface::RTCConfigurationType::kAggressive); 3606 PeerConnectionInterface::RTCConfigurationType::kAggressive);
3607 EXPECT_NE(a, h); 3607 EXPECT_NE(a, h);
3608 } 3608 }
OLDNEW
« no previous file with comments | « webrtc/pc/peerconnectionfactory.cc ('k') | webrtc/pc/test/mock_webrtcsession.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698