| Index: talk/session/media/channel.h
 | 
| diff --git a/talk/session/media/channel.h b/talk/session/media/channel.h
 | 
| index 0a7ce9d1a9e8355bc83ac4433a751ef22deb0354..dec5c985ae164cef0968c6ab3741f65974ba0422 100644
 | 
| --- a/talk/session/media/channel.h
 | 
| +++ b/talk/session/media/channel.h
 | 
| @@ -284,7 +284,8 @@ class BaseChannel
 | 
|  
 | 
|    // Handled in derived classes
 | 
|    // Get the SRTP ciphers to use for RTP media
 | 
| -  virtual void GetSrtpCiphers(std::vector<std::string>* ciphers) const = 0;
 | 
| +  virtual void GetSrtpCryptoSuiteNames(
 | 
| +      std::vector<std::string>* ciphers) const = 0;
 | 
|    virtual void OnConnectionMonitorUpdate(ConnectionMonitor* monitor,
 | 
|        const std::vector<ConnectionInfo>& infos) = 0;
 | 
|  
 | 
| @@ -413,7 +414,7 @@ class VoiceChannel : public BaseChannel {
 | 
|    bool GetStats_w(VoiceMediaInfo* stats);
 | 
|  
 | 
|    virtual void OnMessage(rtc::Message* pmsg);
 | 
| -  virtual void GetSrtpCiphers(std::vector<std::string>* ciphers) const;
 | 
| +  virtual void GetSrtpCryptoSuiteNames(std::vector<std::string>* ciphers) const;
 | 
|    virtual void OnConnectionMonitorUpdate(
 | 
|        ConnectionMonitor* monitor, const std::vector<ConnectionInfo>& infos);
 | 
|    virtual void OnMediaMonitorUpdate(
 | 
| @@ -510,7 +511,7 @@ class VideoChannel : public BaseChannel {
 | 
|    bool GetStats_w(VideoMediaInfo* stats);
 | 
|  
 | 
|    virtual void OnMessage(rtc::Message* pmsg);
 | 
| -  virtual void GetSrtpCiphers(std::vector<std::string>* ciphers) const;
 | 
| +  virtual void GetSrtpCryptoSuiteNames(std::vector<std::string>* ciphers) const;
 | 
|    virtual void OnConnectionMonitorUpdate(
 | 
|        ConnectionMonitor* monitor, const std::vector<ConnectionInfo>& infos);
 | 
|    virtual void OnMediaMonitorUpdate(
 | 
| @@ -635,7 +636,7 @@ class DataChannel : public BaseChannel {
 | 
|    virtual bool WantsPacket(bool rtcp, rtc::Buffer* packet);
 | 
|  
 | 
|    virtual void OnMessage(rtc::Message* pmsg);
 | 
| -  virtual void GetSrtpCiphers(std::vector<std::string>* ciphers) const;
 | 
| +  virtual void GetSrtpCryptoSuiteNames(std::vector<std::string>* ciphers) const;
 | 
|    virtual void OnConnectionMonitorUpdate(
 | 
|        ConnectionMonitor* monitor, const std::vector<ConnectionInfo>& infos);
 | 
|    virtual void OnMediaMonitorUpdate(
 | 
| 
 |