Drop VideoOptions from VideoSendParameters.

webrtc/media/base/mediachannel.h

Index: webrtc/media/base/mediachannel.h
diff --git a/webrtc/media/base/mediachannel.h b/webrtc/media/base/mediachannel.h
index bab72b21926654ad0fb55c559787f717cdaf224c..3406ebaf83545eaee09d290fb858babac49d2789 100644
--- a/webrtc/media/base/mediachannel.h
+++ b/webrtc/media/base/mediachannel.h
@@ -847,7 +847,7 @@ struct RtpParameters {
   RtcpParameters rtcp;
 };
 
-template <class Codec, class Options>
+template <class Codec>
 struct RtpSendParameters : RtpParameters<Codec> {
   std::string ToString() const override {
     std::ostringstream ost;
@@ -855,16 +855,26 @@ struct RtpSendParameters : RtpParameters<Codec> {
     ost << "codecs: " << VectorToString(this->codecs) << ", ";
     ost << "extensions: " << VectorToString(this->extensions) << ", ";
     ost << "max_bandwidth_bps: " << max_bandwidth_bps << ", ";
-    ost << "options: " << options.ToString();
     ost << "}";
     return ost.str();
   }
 
   int max_bandwidth_bps = -1;
-  Options options;
 };
 
-struct AudioSendParameters : RtpSendParameters<AudioCodec, AudioOptions> {
+struct AudioSendParameters : RtpSendParameters<AudioCodec> {
+  std::string ToString() const override {
+    std::ostringstream ost;
+    ost << "{";
+    ost << "codecs: " << VectorToString(this->codecs) << ", ";
+    ost << "extensions: " << VectorToString(this->extensions) << ", ";
+    ost << "max_bandwidth_bps: " << max_bandwidth_bps << ", ";
+    ost << "options: " << options.ToString();
+    ost << "}";
+    return ost.str();
+  }
+
+  AudioOptions options;
 };
 
 struct AudioRecvParameters : RtpParameters<AudioCodec> {
@@ -934,7 +944,7 @@ class VoiceMediaChannel : public MediaChannel {
       std::unique_ptr<webrtc::AudioSinkInterface> sink) = 0;
 };
 
-struct VideoSendParameters : RtpSendParameters<VideoCodec, VideoOptions> {
+struct VideoSendParameters : RtpSendParameters<VideoCodec> {
   // Use conference mode? This flag comes from the remote
   // description's SDP line 'a=x-google-flag:conference', copied over
   // by VideoChannel::SetRemoteContent_w, and ultimately used by
@@ -1055,13 +1065,7 @@ struct SendDataParams {
 
 enum SendDataResult { SDR_SUCCESS, SDR_ERROR, SDR_BLOCK };
 
-struct DataOptions {
-  std::string ToString() const {
-    return "{}";
-  }
-};
-
-struct DataSendParameters : RtpSendParameters<DataCodec, DataOptions> {
+struct DataSendParameters : RtpSendParameters<DataCodec> {
   std::string ToString() const {
     std::ostringstream ost;
     // Options and extensions aren't used.