Change WebRTC SslCipher to be exposed as number only.

talk/session/media/channel_unittest.cc

 /*
  * libjingle
  * Copyright 2009 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 1752 matching lines @@
 
 template<>
 void ChannelTest<VoiceTraits>::CreateContent(
     int flags,
     const cricket::AudioCodec& audio_codec,
     const cricket::VideoCodec& video_codec,
     cricket::AudioContentDescription* audio) {
   audio->AddCodec(audio_codec);
   audio->set_rtcp_mux((flags & RTCP_MUX) != 0);
   if (flags & SECURE) {
-    audio->AddCrypto(cricket::CryptoParams(
-        1, cricket::CS_AES_CM_128_HMAC_SHA1_32,
-        "inline:" + rtc::CreateRandomString(40), ""));
+    audio->AddCrypto(
+        cricket::CryptoParams(1, rtc::CS_AES_CM_128_HMAC_SHA1_32,
+                              "inline:" + rtc::CreateRandomString(40), ""));

[Ryan Sleevi, 2015/09/28 17:24:17]

nit: std::string() will be slightly more efficient here...

[guoweis_webrtc, 2015/09/30 04:09:46]

Done.

   }
 }
 
 template<>
 void ChannelTest<VoiceTraits>::CopyContent(
     const cricket::AudioContentDescription& source,
     cricket::AudioContentDescription* audio) {
   *audio = source;
 }
 
@@ skipping 44 matching lines @@
 
 template<>
 void ChannelTest<VideoTraits>::CreateContent(
     int flags,
     const cricket::AudioCodec& audio_codec,
     const cricket::VideoCodec& video_codec,
     cricket::VideoContentDescription* video) {
   video->AddCodec(video_codec);
   video->set_rtcp_mux((flags & RTCP_MUX) != 0);
   if (flags & SECURE) {
-    video->AddCrypto(cricket::CryptoParams(
-        1, cricket::CS_AES_CM_128_HMAC_SHA1_80,
-        "inline:" + rtc::CreateRandomString(40), ""));
+    video->AddCrypto(
+        cricket::CryptoParams(1, rtc::CS_AES_CM_128_HMAC_SHA1_80,
+                              "inline:" + rtc::CreateRandomString(40), ""));

[Ryan Sleevi, 2015/09/28 17:24:17]

same throughout

[guoweis_webrtc, 2015/09/30 04:09:46]

Done.

   }
 }
 
 template<>
 void ChannelTest<VideoTraits>::CopyContent(
     const cricket::VideoContentDescription& source,
     cricket::VideoContentDescription* video) {
   *video = source;
 }
 
@@ skipping 727 matching lines @@
 
 template<>
 void ChannelTest<DataTraits>::CreateContent(
     int flags,
     const cricket::AudioCodec& audio_codec,
     const cricket::VideoCodec& video_codec,
     cricket::DataContentDescription* data) {
   data->AddCodec(kGoogleDataCodec);
   data->set_rtcp_mux((flags & RTCP_MUX) != 0);
   if (flags & SECURE) {
-    data->AddCrypto(cricket::CryptoParams(
-        1, cricket::CS_AES_CM_128_HMAC_SHA1_32,
-        "inline:" + rtc::CreateRandomString(40), ""));
+    data->AddCrypto(
+        cricket::CryptoParams(1, rtc::CS_AES_CM_128_HMAC_SHA1_32,
+                              "inline:" + rtc::CreateRandomString(40), ""));
   }
 }
 
 template<>
 void ChannelTest<DataTraits>::CopyContent(
     const cricket::DataContentDescription& source,
     cricket::DataContentDescription* data) {
   *data = source;
 }
 
@@ skipping 146 matching lines @@
   };
   rtc::Buffer payload(data, 3);
   cricket::SendDataResult result;
   ASSERT_TRUE(media_channel1_->SendData(params, payload, &result));
   EXPECT_EQ(params.ssrc,
             media_channel1_->last_sent_data_params().ssrc);
   EXPECT_EQ("foo", media_channel1_->last_sent_data());
 }
 
 // TODO(pthatcher): TestSetReceiver?