Add IsAcceptableCipher, use instead of GetDefaultCipher.

webrtc/api/peerconnection_unittest.cc

Index: webrtc/api/peerconnection_unittest.cc
diff --git a/webrtc/api/peerconnection_unittest.cc b/webrtc/api/peerconnection_unittest.cc
index a43d075d57416231cbf5765baba5f516763d3b0a..eaaa4a00acdcfc6e1aaaa13de43d0f0478a61b1b 100644
--- a/webrtc/api/peerconnection_unittest.cc
+++ b/webrtc/api/peerconnection_unittest.cc
@@ -1448,15 +1448,16 @@ TEST_F(P2PTestConductor, GetDtls12None) {
   initializing_client()->pc()->RegisterUMAObserver(init_observer);
   LocalP2PTest();
 
-  EXPECT_EQ_WAIT(rtc::SSLStreamAdapter::SslCipherSuiteToName(
-                     rtc::SSLStreamAdapter::GetDefaultSslCipherForTest(
-                         rtc::SSL_PROTOCOL_DTLS_10, rtc::KT_DEFAULT)),
-                 initializing_client()->GetDtlsCipherStats(),
-                 kMaxWaitForStatsMs);
+  EXPECT_TRUE_WAIT(rtc::SSLStreamAdapter::IsAcceptableCipher(

[tommi, 2016/03/07 23:47:26]

Just curious - Instead of using the "WAIT" macros, is there a callback that
could be used?
The WAIT macros can repeatedly evaluate the expression and expand the expression
into more than one call site, which is not obvious from just reading the code.

[torbjorng (webrtc), 2016/03/08 20:17:05]

Perhaps. The present code is a bit odd, with timeout calls nested in each other.
Since _WAIT also runs an event loop and since I just want to re-enable tests
again, I will for now resist the temptation of improving this code.

+                       initializing_client()->GetDtlsCipherStats(),
+                       rtc::SSL_PROTOCOL_DTLS_10, rtc::KT_DEFAULT),
+                   kMaxWaitForStatsMs);
+#if 0

[tommi, 2016/03/07 23:47:26]

if this block should be deleted, let's just delete it instead of keeping it
around as dead code.

[torbjorng (webrtc), 2016/03/08 20:17:05]

Done.

   EXPECT_EQ(1, init_observer->GetEnumCounter(
                    webrtc::kEnumCounterAudioSslCipher,
                    rtc::SSLStreamAdapter::GetDefaultSslCipherForTest(
                        rtc::SSL_PROTOCOL_DTLS_10, rtc::KT_DEFAULT)));
+#endif
 
   EXPECT_EQ_WAIT(rtc::SrtpCryptoSuiteToName(kDefaultSrtpCryptoSuite),
                  initializing_client()->GetSrtpCipherStats(),
@@ -1479,15 +1480,16 @@ TEST_F(P2PTestConductor, GetDtls12Both) {
   initializing_client()->pc()->RegisterUMAObserver(init_observer);
   LocalP2PTest();
 
-  EXPECT_EQ_WAIT(rtc::SSLStreamAdapter::SslCipherSuiteToName(
-                     rtc::SSLStreamAdapter::GetDefaultSslCipherForTest(
-                         rtc::SSL_PROTOCOL_DTLS_12, rtc::KT_DEFAULT)),
-                 initializing_client()->GetDtlsCipherStats(),
-                 kMaxWaitForStatsMs);
+  EXPECT_TRUE_WAIT(rtc::SSLStreamAdapter::IsAcceptableCipher(
+                       initializing_client()->GetDtlsCipherStats(),
+                       rtc::SSL_PROTOCOL_DTLS_12, rtc::KT_DEFAULT),
+                   kMaxWaitForStatsMs);
+#if 0
   EXPECT_EQ(1, init_observer->GetEnumCounter(
                    webrtc::kEnumCounterAudioSslCipher,
                    rtc::SSLStreamAdapter::GetDefaultSslCipherForTest(
                        rtc::SSL_PROTOCOL_DTLS_12, rtc::KT_DEFAULT)));
+#endif
 
   EXPECT_EQ_WAIT(rtc::SrtpCryptoSuiteToName(kDefaultSrtpCryptoSuite),
                  initializing_client()->GetSrtpCipherStats(),
@@ -1511,15 +1513,16 @@ TEST_F(P2PTestConductor, GetDtls12Init) {
   initializing_client()->pc()->RegisterUMAObserver(init_observer);
   LocalP2PTest();
 
-  EXPECT_EQ_WAIT(rtc::SSLStreamAdapter::SslCipherSuiteToName(
-                     rtc::SSLStreamAdapter::GetDefaultSslCipherForTest(
-                         rtc::SSL_PROTOCOL_DTLS_10, rtc::KT_DEFAULT)),
-                 initializing_client()->GetDtlsCipherStats(),
-                 kMaxWaitForStatsMs);
+  EXPECT_TRUE_WAIT(rtc::SSLStreamAdapter::IsAcceptableCipher(
+                       initializing_client()->GetDtlsCipherStats(),
+                       rtc::SSL_PROTOCOL_DTLS_10, rtc::KT_DEFAULT),
+                   kMaxWaitForStatsMs);
+#if 0
   EXPECT_EQ(1, init_observer->GetEnumCounter(
                    webrtc::kEnumCounterAudioSslCipher,
                    rtc::SSLStreamAdapter::GetDefaultSslCipherForTest(
                        rtc::SSL_PROTOCOL_DTLS_10, rtc::KT_DEFAULT)));
+#endif
 
   EXPECT_EQ_WAIT(rtc::SrtpCryptoSuiteToName(kDefaultSrtpCryptoSuite),
                  initializing_client()->GetSrtpCipherStats(),
@@ -1543,15 +1546,16 @@ TEST_F(P2PTestConductor, GetDtls12Recv) {
   initializing_client()->pc()->RegisterUMAObserver(init_observer);
   LocalP2PTest();
 
-  EXPECT_EQ_WAIT(rtc::SSLStreamAdapter::SslCipherSuiteToName(
-                     rtc::SSLStreamAdapter::GetDefaultSslCipherForTest(
-                         rtc::SSL_PROTOCOL_DTLS_10, rtc::KT_DEFAULT)),
-                 initializing_client()->GetDtlsCipherStats(),
-                 kMaxWaitForStatsMs);
+  EXPECT_TRUE_WAIT(rtc::SSLStreamAdapter::IsAcceptableCipher(
+                       initializing_client()->GetDtlsCipherStats(),
+                       rtc::SSL_PROTOCOL_DTLS_10, rtc::KT_DEFAULT),
+                   kMaxWaitForStatsMs);
+#if 0
   EXPECT_EQ(1, init_observer->GetEnumCounter(
                    webrtc::kEnumCounterAudioSslCipher,
                    rtc::SSLStreamAdapter::GetDefaultSslCipherForTest(
                        rtc::SSL_PROTOCOL_DTLS_10, rtc::KT_DEFAULT)));
+#endif
 
   EXPECT_EQ_WAIT(rtc::SrtpCryptoSuiteToName(kDefaultSrtpCryptoSuite),
                  initializing_client()->GetSrtpCipherStats(),