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

webrtc/p2p/base/dtlstransportchannel_unittest.cc

Index: webrtc/p2p/base/dtlstransportchannel_unittest.cc
diff --git a/webrtc/p2p/base/dtlstransportchannel_unittest.cc b/webrtc/p2p/base/dtlstransportchannel_unittest.cc
index 17e7a0bcadfc3ce9b0f0a98c9aa5c5ac5a15a6e4..95fc0d19f9f36e112b2010739c7475fdc07bff42 100644
--- a/webrtc/p2p/base/dtlstransportchannel_unittest.cc
+++ b/webrtc/p2p/base/dtlstransportchannel_unittest.cc
@@ -97,7 +97,7 @@ class DtlsTestClient : public sigslot::has_slots<> {
           this, &DtlsTestClient::OnFakeTransportChannelReadPacket);
 
       cricket::DtlsTransport* dtls =
-          new cricket::DtlsTransport(fake_ice_channel);
+          new cricket::DtlsTransport(fake_ice_channel, rtc::CryptoOptions());
       dtls->SetLocalCertificate(certificate_);
       dtls->ice_transport()->SetIceRole(role);
       dtls->ice_transport()->SetIceTiebreaker(
@@ -146,18 +146,6 @@ class DtlsTestClient : public sigslot::has_slots<> {
               local_role, remote_role, flags);
   }
 
-  void MaybeSetSrtpCryptoSuites() {
-    if (!use_dtls_srtp_) {
-      return;
-    }
-    std::vector<int> ciphers;
-    ciphers.push_back(rtc::SRTP_AES128_CM_SHA1_80);
-    // SRTP ciphers will be set only in the beginning.
-    for (const auto& dtls : fake_dtls_transports_) {
-      EXPECT_TRUE(dtls->SetSrtpCryptoSuites(ciphers));
-    }
-  }
-
   void SetLocalTransportDescription(
       const rtc::scoped_refptr<rtc::RTCCertificate>& cert,
       cricket::ContentAction action,
@@ -193,10 +181,6 @@ class DtlsTestClient : public sigslot::has_slots<> {
                  ConnectionRole local_role,
                  ConnectionRole remote_role,
                  int flags) {
-    if (!(flags & NF_REOFFER)) {
-      // SRTP ciphers will be set only in the beginning.
-      MaybeSetSrtpCryptoSuites();
-    }
     if (action == cricket::CA_OFFER) {
       SetLocalTransportDescription(local_cert, cricket::CA_OFFER, local_role,
                                    flags);
@@ -506,8 +490,6 @@ class DtlsTransportChannelTestBase {
     } else {
       client1_.SetupChannels(channel_ct_, cricket::ICEROLE_CONTROLLING);
       client2_.SetupChannels(channel_ct_, cricket::ICEROLE_CONTROLLED);
-      client1_.MaybeSetSrtpCryptoSuites();
-      client2_.MaybeSetSrtpCryptoSuites();
       // This is equivalent to an offer being processed on both sides, but an
       // answer not yet being received on the initiating side. So the
       // connection will be made before negotiation has finished on both sides.