Change WebRTC SslCipher to be exposed as number only.

webrtc/base/sslstreamadapter_unittest.cc

Index: webrtc/base/sslstreamadapter_unittest.cc
diff --git a/webrtc/base/sslstreamadapter_unittest.cc b/webrtc/base/sslstreamadapter_unittest.cc
index 68e1b64dbe91a38aac7d5ff076d045be0d1e3074..862f7b041450b6c35503f0a10719c5cdd99728bd 100644
--- a/webrtc/base/sslstreamadapter_unittest.cc
+++ b/webrtc/base/sslstreamadapter_unittest.cc
@@ -411,10 +411,16 @@ class SSLStreamAdapterTestBase : public testing::Test,
   }
 
   bool GetSslCipher(bool client, std::string *retval) {
+    SslCipher cipher;
+    bool ret;
     if (client)
-      return client_ssl_->GetSslCipher(retval);
+      ret = client_ssl_->GetSslCipher(&cipher);
     else
-      return server_ssl_->GetSslCipher(retval);
+      ret = server_ssl_->GetSslCipher(&cipher);
+
+    if (ret)
+      *retval = cipher.rfc_name;
+    return ret;
   }
 
   bool ExportKeyingMaterial(const char *label,
@@ -978,9 +984,10 @@ TEST_P(SSLStreamAdapterTestDTLS, TestGetSslCipher) {
   ASSERT_TRUE(GetSslCipher(false, &server_cipher));
 
   ASSERT_EQ(client_cipher, server_cipher);
-  ASSERT_EQ(rtc::SSLStreamAdapter::GetDefaultSslCipher(
-                rtc::SSL_PROTOCOL_DTLS_10, ::testing::get<1>(GetParam())),
-            server_cipher);
+  ASSERT_EQ(
+      rtc::SSLStreamAdapter::GetDefaultSslCipher(
+          rtc::SSL_PROTOCOL_DTLS_10, ::testing::get<1>(GetParam())).rfc_name,
+      server_cipher);
 }
 
 // Test getting the used DTLS 1.2 ciphers.
@@ -996,9 +1003,10 @@ TEST_P(SSLStreamAdapterTestDTLS, TestGetSslCipherDtls12Both) {
   ASSERT_TRUE(GetSslCipher(false, &server_cipher));
 
   ASSERT_EQ(client_cipher, server_cipher);
-  ASSERT_EQ(rtc::SSLStreamAdapter::GetDefaultSslCipher(
-                rtc::SSL_PROTOCOL_DTLS_12, ::testing::get<1>(GetParam())),
-            server_cipher);
+  ASSERT_EQ(
+      rtc::SSLStreamAdapter::GetDefaultSslCipher(
+          rtc::SSL_PROTOCOL_DTLS_12, ::testing::get<1>(GetParam())).rfc_name,
+      server_cipher);
 }
 
 // DTLS 1.2 enabled for client only -> DTLS 1.0 will be used.
@@ -1013,9 +1021,10 @@ TEST_P(SSLStreamAdapterTestDTLS, TestGetSslCipherDtls12Client) {
   ASSERT_TRUE(GetSslCipher(false, &server_cipher));
 
   ASSERT_EQ(client_cipher, server_cipher);
-  ASSERT_EQ(rtc::SSLStreamAdapter::GetDefaultSslCipher(
-                rtc::SSL_PROTOCOL_DTLS_10, ::testing::get<1>(GetParam())),
-            server_cipher);
+  ASSERT_EQ(
+      rtc::SSLStreamAdapter::GetDefaultSslCipher(
+          rtc::SSL_PROTOCOL_DTLS_10, ::testing::get<1>(GetParam())).rfc_name,
+      server_cipher);
 }
 
 // DTLS 1.2 enabled for server only -> DTLS 1.0 will be used.