| Index: talk/session/media/channelmanager.h
 | 
| diff --git a/talk/session/media/channelmanager.h b/talk/session/media/channelmanager.h
 | 
| index f69bf9a2935c2a25bca79a555e2e3e49a4118031..65f6182e5d00f13551e6710b9f09950b97bcb66f 100644
 | 
| --- a/talk/session/media/channelmanager.h
 | 
| +++ b/talk/session/media/channelmanager.h
 | 
| @@ -132,6 +132,7 @@ class ChannelManager : public rtc::MessageHandler,
 | 
|    // RTX will be enabled/disabled in engines that support it. The supporting
 | 
|    // engines will start offering an RTX codec. Must be called before Init().
 | 
|    bool SetVideoRtxEnabled(bool enable);
 | 
| +  bool SetCryptoOptions(const rtc::CryptoOptions& crypto_options);
 | 
|  
 | 
|    // Starts/stops the local microphone and enables polling of the input level.
 | 
|    bool capturing() const { return capturing_; }
 | 
| @@ -231,6 +232,7 @@ class ChannelManager : public rtc::MessageHandler,
 | 
|    int audio_output_volume_;
 | 
|    VideoRenderer* local_renderer_;
 | 
|    bool enable_rtx_;
 | 
| +  rtc::CryptoOptions crypto_options_;
 | 
|  
 | 
|    bool capturing_;
 | 
|  };
 | 
| 
 |