Removing "crypto_required" from MediaContentDescription.

webrtc/pc/channel.h

Index: webrtc/pc/channel.h
diff --git a/webrtc/pc/channel.h b/webrtc/pc/channel.h
index 308903c2db1cf9774c3b43bc14b13a96ebff014c..54354ea09b4e3c0f8f8fddd823fbb2dbf5fe3107 100644
--- a/webrtc/pc/channel.h
+++ b/webrtc/pc/channel.h
@@ -76,12 +76,15 @@ class BaseChannel
       public ConnectionStatsGetter {
  public:
   // |rtcp| represents whether or not this channel uses RTCP.
+  // If |secure_required| is true, the channel will not send or receive any
+  // media without using SRTP (either using SDES or DTLS-SRTP).

[pthatcher1, 2016/11/30 19:16:17]

More specifically, it won't send RTP that's not SRTP.  It will sends SCTP (but
only with DTLS).  All the more reason to call this "srtp_required".

[Taylor Brandstetter, 2016/12/01 02:41:34]

Done.

   BaseChannel(rtc::Thread* worker_thread,
               rtc::Thread* network_thread,
               MediaChannel* channel,
               TransportController* transport_controller,
               const std::string& content_name,
-              bool rtcp);
+              bool rtcp,
+              bool secure_required);
   virtual ~BaseChannel();
   bool Init_w(const std::string* bundle_transport_name);
   // Deinit may be called multiple times and is simply ignored if it's already
@@ -206,9 +209,6 @@ class BaseChannel
   void set_remote_content_direction(MediaContentDirection direction) {
     remote_content_direction_ = direction;
   }
-  void set_secure_required(bool secure_required) {
-    secure_required_ = secure_required;
-  }
   // These methods verify that:
   // * The required content description directions have been set.
   // * The channel is enabled.
@@ -425,7 +425,8 @@ class VoiceChannel : public BaseChannel {
                VoiceMediaChannel* channel,
                TransportController* transport_controller,
                const std::string& content_name,
-               bool rtcp);
+               bool rtcp,
+               bool secure_required);
   ~VoiceChannel();
   bool Init_w(const std::string* bundle_transport_name);
 
@@ -542,7 +543,8 @@ class VideoChannel : public BaseChannel {
                VideoMediaChannel* channel,
                TransportController* transport_controller,
                const std::string& content_name,
-               bool rtcp);
+               bool rtcp,
+               bool secure_required);
   ~VideoChannel();
   bool Init_w(const std::string* bundle_transport_name);
 
@@ -620,7 +622,8 @@ class DataChannel : public BaseChannel {
               DataMediaChannel* media_channel,
               TransportController* transport_controller,
               const std::string& content_name,
-              bool rtcp);
+              bool rtcp,
+              bool secure_required);
   ~DataChannel();
   bool Init_w(const std::string* bundle_transport_name);