Revert of Convert internal representation of Srtp cryptos from string to int.

webrtc/p2p/base/transportchannel.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 90 matching lines @@
   // Returns the current stats for this connection.
   virtual bool GetStats(ConnectionInfos* infos) = 0;
 
   // Is DTLS active?
   virtual bool IsDtlsActive() const = 0;
 
   // Default implementation.
   virtual bool GetSslRole(rtc::SSLRole* role) const = 0;
 
   // Sets up the ciphers to use for DTLS-SRTP.
-  virtual bool SetSrtpCryptoSuites(const std::vector<int>& ciphers) = 0;
-  // Keep the original one for backward compatibility until all dependencies
-  // move away. TODO(guoweis): Remove this function.
-  virtual bool SetSrtpCiphers(const std::vector<std::string>& ciphers);
+  virtual bool SetSrtpCiphers(const std::vector<std::string>& ciphers) = 0;
 
   // Finds out which DTLS-SRTP cipher was negotiated.
   // TODO(guoweis): Remove this once all dependencies implement this.
-  virtual bool GetSrtpCryptoSuite(int* cipher) { return false; }
+  virtual bool GetSrtpCryptoSuite(std::string* cipher) {
+    return false;
+  }
 
   // Finds out which DTLS cipher was negotiated.
   // TODO(guoweis): Remove this once all dependencies implement this.
   virtual bool GetSslCipherSuite(int* cipher) { return false; }
 
   // Gets the local RTCCertificate used for DTLS.
   virtual rtc::scoped_refptr<rtc::RTCCertificate>
   GetLocalCertificate() const = 0;
 
   // Gets a copy of the remote side's SSL certificate, owned by the caller.
@@ skipping 42 matching lines @@
   bool writable_;
   bool receiving_;
   DtlsTransportState dtls_state_ = DTLS_TRANSPORT_NEW;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(TransportChannel);
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_TRANSPORTCHANNEL_H_