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..8e5349adaac7fe1abbaa837dbea6204c5c96013f 100644
--- a/webrtc/base/sslstreamadapter_unittest.cc
+++ b/webrtc/base/sslstreamadapter_unittest.cc
@@ -410,7 +410,7 @@ class SSLStreamAdapterTestBase : public testing::Test,
       return server_ssl_->GetPeerCertificate(cert);
   }
 
-  bool GetSslCipher(bool client, std::string *retval) {
+  bool GetSslCipher(bool client, uint16_t* retval) {
     if (client)
       return client_ssl_->GetSslCipher(retval);
     else
@@ -972,13 +972,13 @@ TEST_P(SSLStreamAdapterTestDTLS, TestGetSslCipher) {
   SetupProtocolVersions(rtc::SSL_PROTOCOL_DTLS_10, rtc::SSL_PROTOCOL_DTLS_10);
   TestHandshake();
 
-  std::string client_cipher;
+  uint16_t client_cipher;
   ASSERT_TRUE(GetSslCipher(true, &client_cipher));
-  std::string server_cipher;
+  uint16_t server_cipher;
   ASSERT_TRUE(GetSslCipher(false, &server_cipher));
 
   ASSERT_EQ(client_cipher, server_cipher);
-  ASSERT_EQ(rtc::SSLStreamAdapter::GetDefaultSslCipher(
+  ASSERT_EQ(rtc::SSLStreamAdapter::GetDefaultSslCipherForTest(
                 rtc::SSL_PROTOCOL_DTLS_10, ::testing::get<1>(GetParam())),
             server_cipher);
 }
@@ -990,13 +990,13 @@ TEST_P(SSLStreamAdapterTestDTLS, TestGetSslCipherDtls12Both) {
   SetupProtocolVersions(rtc::SSL_PROTOCOL_DTLS_12, rtc::SSL_PROTOCOL_DTLS_12);
   TestHandshake();
 
-  std::string client_cipher;
+  uint16_t client_cipher;
   ASSERT_TRUE(GetSslCipher(true, &client_cipher));
-  std::string server_cipher;
+  uint16_t server_cipher;
   ASSERT_TRUE(GetSslCipher(false, &server_cipher));
 
   ASSERT_EQ(client_cipher, server_cipher);
-  ASSERT_EQ(rtc::SSLStreamAdapter::GetDefaultSslCipher(
+  ASSERT_EQ(rtc::SSLStreamAdapter::GetDefaultSslCipherForTest(
                 rtc::SSL_PROTOCOL_DTLS_12, ::testing::get<1>(GetParam())),
             server_cipher);
 }
@@ -1007,13 +1007,13 @@ TEST_P(SSLStreamAdapterTestDTLS, TestGetSslCipherDtls12Client) {
   SetupProtocolVersions(rtc::SSL_PROTOCOL_DTLS_10, rtc::SSL_PROTOCOL_DTLS_12);
   TestHandshake();
 
-  std::string client_cipher;
+  uint16_t client_cipher;
   ASSERT_TRUE(GetSslCipher(true, &client_cipher));
-  std::string server_cipher;
+  uint16_t server_cipher;
   ASSERT_TRUE(GetSslCipher(false, &server_cipher));
 
   ASSERT_EQ(client_cipher, server_cipher);
-  ASSERT_EQ(rtc::SSLStreamAdapter::GetDefaultSslCipher(
+  ASSERT_EQ(rtc::SSLStreamAdapter::GetDefaultSslCipherForTest(
                 rtc::SSL_PROTOCOL_DTLS_10, ::testing::get<1>(GetParam())),
             server_cipher);
 }
@@ -1024,13 +1024,13 @@ TEST_P(SSLStreamAdapterTestDTLS, TestGetSslCipherDtls12Server) {
   SetupProtocolVersions(rtc::SSL_PROTOCOL_DTLS_12, rtc::SSL_PROTOCOL_DTLS_10);
   TestHandshake();
 
-  std::string client_cipher;
+  uint16_t client_cipher;
   ASSERT_TRUE(GetSslCipher(true, &client_cipher));
-  std::string server_cipher;
+  uint16_t server_cipher;
   ASSERT_TRUE(GetSslCipher(false, &server_cipher));
 
   ASSERT_EQ(client_cipher, server_cipher);
-  ASSERT_EQ(rtc::SSLStreamAdapter::GetDefaultSslCipher(
+  ASSERT_EQ(rtc::SSLStreamAdapter::GetDefaultSslCipherForTest(
                 rtc::SSL_PROTOCOL_DTLS_10, ::testing::get<1>(GetParam())),
             server_cipher);
 }