| Index: webrtc/p2p/base/dtlstransportchannel.cc
 | 
| diff --git a/webrtc/p2p/base/dtlstransportchannel.cc b/webrtc/p2p/base/dtlstransportchannel.cc
 | 
| index b434d0860e1e73763a89d1fddbc2439d39fd5c4f..8a1d6d1932b9f5a31b2794f0dec08b2c89c1443b 100644
 | 
| --- a/webrtc/p2p/base/dtlstransportchannel.cc
 | 
| +++ b/webrtc/p2p/base/dtlstransportchannel.cc
 | 
| @@ -186,7 +186,7 @@ bool DtlsTransportChannelWrapper::GetSslRole(rtc::SSLRole* role) const {
 | 
|    return true;
 | 
|  }
 | 
|  
 | 
| -bool DtlsTransportChannelWrapper::GetSslCipher(std::string* cipher) {
 | 
| +bool DtlsTransportChannelWrapper::GetSslCipher(uint16_t* cipher) {
 | 
|    if (dtls_state_ != STATE_OPEN) {
 | 
|      return false;
 | 
|    }
 | 
| @@ -330,7 +330,7 @@ bool DtlsTransportChannelWrapper::SetSrtpCiphers(
 | 
|    return true;
 | 
|  }
 | 
|  
 | 
| -bool DtlsTransportChannelWrapper::GetSrtpCipher(std::string* cipher) {
 | 
| +bool DtlsTransportChannelWrapper::GetSrtpCipherByRfcName(std::string* cipher) {
 | 
|    if (dtls_state_ != STATE_OPEN) {
 | 
|      return false;
 | 
|    }
 | 
| 
 |