| Index: webrtc/pc/channelmanager.h
 | 
| diff --git a/webrtc/pc/channelmanager.h b/webrtc/pc/channelmanager.h
 | 
| index c6a67dfb0746dbfb931112003f83884031f73add..15a3752c44a730ae85ecaac07576825a990ffc8c 100644
 | 
| --- a/webrtc/pc/channelmanager.h
 | 
| +++ b/webrtc/pc/channelmanager.h
 | 
| @@ -125,6 +125,10 @@ class ChannelManager {
 | 
|    // engines will start offering an RTX codec. Must be called before Init().
 | 
|    bool SetVideoRtxEnabled(bool enable);
 | 
|  
 | 
| +  // Define crypto options to set on newly created channels. Doesn't change
 | 
| +  // options on already created channels.
 | 
| +  bool SetCryptoOptions(const rtc::CryptoOptions& crypto_options);
 | 
| +
 | 
|    // Starts/stops the local microphone and enables polling of the input level.
 | 
|    bool capturing() const { return capturing_; }
 | 
|  
 | 
| @@ -150,6 +154,7 @@ class ChannelManager {
 | 
|    bool InitMediaEngine_w();
 | 
|    void DestructorDeletes_w();
 | 
|    void Terminate_w();
 | 
| +  bool SetCryptoOptions_w(const rtc::CryptoOptions& crypto_options);
 | 
|    VoiceChannel* CreateVoiceChannel_w(
 | 
|        webrtc::MediaControllerInterface* media_controller,
 | 
|        TransportController* transport_controller,
 | 
| @@ -185,6 +190,7 @@ class ChannelManager {
 | 
|    DataChannels data_channels_;
 | 
|  
 | 
|    bool enable_rtx_;
 | 
| +  rtc::CryptoOptions crypto_options_;
 | 
|  
 | 
|    bool capturing_;
 | 
|  };
 | 
| 
 |