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

Unified Diff: webrtc/p2p/base/faketransportcontroller.h

Issue 2815513012: Negotiate the same SRTP crypto suites for every DTLS association formed. (Closed)
Patch Set: Prefer 32-bit HMAC by default. Also cleaning up some things. 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/p2p/base/faketransportcontroller.h
diff --git a/webrtc/p2p/base/faketransportcontroller.h b/webrtc/p2p/base/faketransportcontroller.h
index 35af390d8124b5e7a389ae9832c1da18badaf776..9a696bca5ab1d5513b73b9a5dfef1aeb8e3307aa 100644
--- a/webrtc/p2p/base/faketransportcontroller.h
+++ b/webrtc/p2p/base/faketransportcontroller.h
@@ -35,26 +35,39 @@ class FakeTransportController : public TransportController {
FakeTransportController()
: TransportController(rtc::Thread::Current(),
rtc::Thread::Current(),
- nullptr) {}
+ nullptr,
+ /*redetermine_role_on_ice_restart=*/true,
Taylor Brandstetter 2017/04/17 22:00:34 I know we don't use this style typically, but I th
pthatcher1 2017/04/17 22:12:41 I don't like the look of it, but it seems like a g
+ rtc::CryptoOptions()) {}
explicit FakeTransportController(bool redetermine_role_on_ice_restart)
: TransportController(rtc::Thread::Current(),
rtc::Thread::Current(),
nullptr,
- redetermine_role_on_ice_restart) {}
+ redetermine_role_on_ice_restart,
+ rtc::CryptoOptions()) {}
explicit FakeTransportController(IceRole role)
: TransportController(rtc::Thread::Current(),
rtc::Thread::Current(),
- nullptr) {
+ nullptr,
+ /*redetermine_role_on_ice_restart=*/true,
+ rtc::CryptoOptions()) {
SetIceRole(role);
}
explicit FakeTransportController(rtc::Thread* network_thread)
- : TransportController(rtc::Thread::Current(), network_thread, nullptr) {}
+ : TransportController(rtc::Thread::Current(),
+ network_thread,
+ nullptr,
+ /*redetermine_role_on_ice_restart=*/true,
+ rtc::CryptoOptions()) {}
FakeTransportController(rtc::Thread* network_thread, IceRole role)
- : TransportController(rtc::Thread::Current(), network_thread, nullptr) {
+ : TransportController(rtc::Thread::Current(),
+ network_thread,
+ nullptr,
+ /*redetermine_role_on_ice_restart=*/true,
+ rtc::CryptoOptions()) {
SetIceRole(role);
}

Powered by Google App Engine
This is Rietveld 408576698