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..0cdba39d57f6de4ea2136fd72a7aeb3cd2215e6a 100644
--- a/webrtc/base/sslstreamadapter_unittest.cc
+++ b/webrtc/base/sslstreamadapter_unittest.cc
@@ -410,11 +410,17 @@ class SSLStreamAdapterTestBase : public testing::Test,
       return server_ssl_->GetPeerCertificate(cert);
   }
 
-  bool GetSslCipher(bool client, std::string *retval) {
+  bool GetSslCipher(bool client, uint16_t* retval) {
+    uint16_t 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;
+    return ret;

[davidben_webrtc, 2015/09/25 19:23:13]

Nit: Any reason not to just write this as:

  if (client)
    return client_ssl_->GetSslCipher(retval);
  else
    return server_ssl_->GetSslCipher(retval);

   }
 
   bool ExportKeyingMaterial(const char *label,
@@ -972,13 +978,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 +996,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 +1013,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 +1030,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);
 }