Revert of Change WebRTC SslCipher to be exposed as number only.

webrtc/base/opensslstreamadapter.h

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 69 matching lines @@
                     size_t data_len,
                     size_t* read,
                     int* error) override;
   StreamResult Write(const void* data,
                      size_t data_len,
                      size_t* written,
                      int* error) override;
   void Close() override;
   StreamState GetState() const override;
 
-  // TODO(guoweis): Move this away from a static class method.
-  static std::string GetSslCipherSuiteName(uint16_t cipher);
+#ifndef OPENSSL_IS_BORINGSSL
+  // Return the RFC (5246, 3268, etc.) cipher name for an OpenSSL cipher.
+  static const char* GetRfcSslCipherName(const SSL_CIPHER* cipher);
+#endif
 
-  bool GetSslCipherSuite(uint16_t* cipher) override;
+  bool GetSslCipher(std::string* cipher) override;
 
   // Key Extractor interface
   bool ExportKeyingMaterial(const std::string& label,
                             const uint8* context,
                             size_t context_len,
                             bool use_context,
                             uint8* result,
                             size_t result_len) override;
 
   // DTLS-SRTP interface
   bool SetDtlsSrtpCiphers(const std::vector<std::string>& ciphers) override;
   bool GetDtlsSrtpCipher(std::string* cipher) override;
 
   // Capabilities interfaces
   static bool HaveDtls();
   static bool HaveDtlsSrtp();
   static bool HaveExporter();
-
-  // TODO(guoweis): Move this away from a static class method.
-  static uint16_t GetDefaultSslCipherForTest(SSLProtocolVersion version,
-                                             KeyType key_type);
+  static std::string GetDefaultSslCipher(SSLProtocolVersion version,
+                                         KeyType key_type);
 
  protected:
   void OnEvent(StreamInterface* stream, int events, int err) override;
 
  private:
   enum SSLState {
     // Before calling one of the StartSSL methods, data flows
     // in clear text.
     SSL_NONE,
     SSL_WAIT,  // waiting for the stream to open to start SSL negotiation
@@ skipping 81 matching lines @@
 
   // Max. allowed protocol version
   SSLProtocolVersion ssl_max_version_;
 };
 
 /////////////////////////////////////////////////////////////////////////////
 
 }  // namespace rtc
 
 #endif  // WEBRTC_BASE_OPENSSLSTREAMADAPTER_H__