Negotiate the same SRTP crypto suites for every DTLS association formed.

webrtc/p2p/base/transportcontroller.cc

Index: webrtc/p2p/base/transportcontroller.cc
diff --git a/webrtc/p2p/base/transportcontroller.cc b/webrtc/p2p/base/transportcontroller.cc
index df85a7c3584ffb069c52416c1b36fe35b0ecf9ea..db2d8d9e34914c40dec1d959d8a25a9c1a262ac9 100644
--- a/webrtc/p2p/base/transportcontroller.cc
+++ b/webrtc/p2p/base/transportcontroller.cc
@@ -65,22 +65,17 @@ class TransportController::ChannelPair {
   RTC_DISALLOW_COPY_AND_ASSIGN(ChannelPair);
 };
 
-TransportController::TransportController(rtc::Thread* signaling_thread,
-                                         rtc::Thread* network_thread,
-                                         PortAllocator* port_allocator,
-                                         bool redetermine_role_on_ice_restart)
+TransportController::TransportController(
+    rtc::Thread* signaling_thread,
+    rtc::Thread* network_thread,
+    PortAllocator* port_allocator,
+    bool redetermine_role_on_ice_restart,
+    const rtc::CryptoOptions& crypto_options)
     : signaling_thread_(signaling_thread),
       network_thread_(network_thread),
       port_allocator_(port_allocator),
-      redetermine_role_on_ice_restart_(redetermine_role_on_ice_restart) {}
-
-TransportController::TransportController(rtc::Thread* signaling_thread,
-                                         rtc::Thread* network_thread,
-                                         PortAllocator* port_allocator)
-    : TransportController(signaling_thread,
-                          network_thread,
-                          port_allocator,
-                          true) {}
+      redetermine_role_on_ice_restart_(redetermine_role_on_ice_restart),
+      crypto_options_(crypto_options) {}
 
 TransportController::~TransportController() {
   // Channel destructors may try to send packets, so this needs to happen on
@@ -362,7 +357,7 @@ DtlsTransportInternal* TransportController::CreateDtlsTransportChannel_n(
     const std::string&,
     int,
     IceTransportInternal* ice) {
-  DtlsTransport* dtls = new DtlsTransport(ice);
+  DtlsTransport* dtls = new DtlsTransport(ice, crypto_options_);
   dtls->SetSslMaxProtocolVersion(ssl_max_version_);
   return dtls;
 }