Drop VideoOptions from VideoSendParameters.

webrtc/pc/channel.cc

Index: webrtc/pc/channel.cc
diff --git a/webrtc/pc/channel.cc b/webrtc/pc/channel.cc
index 1dc8e7f6bdaa84dfbe9728b14e17d27500ac39de..c244ab9e15a0eeb17446d019f083faeab2ebc4ec 100644
--- a/webrtc/pc/channel.cc
+++ b/webrtc/pc/channel.cc
@@ -141,10 +141,10 @@ void RtpParametersFromMediaDescription(
   params->rtcp.reduced_size = desc->rtcp_reduced_size();
 }
 
-template <class Codec, class Options>
+template <class Codec>
 void RtpSendParametersFromMediaDescription(
     const MediaContentDescriptionImpl<Codec>* desc,
-    RtpSendParameters<Codec, Options>* send_params) {
+    RtpSendParameters<Codec>* send_params) {
   RtpParametersFromMediaDescription(desc, send_params);
   send_params->max_bandwidth_bps = desc->bandwidth();
 }
@@ -1798,7 +1798,11 @@ bool VideoChannel::SetRemoteContent_w(const MediaContentDescription* content,
   VideoSendParameters send_params = last_send_params_;
   RtpSendParametersFromMediaDescription(video, &send_params);
   if (video->conference_mode()) {
+#if 0
+    // TODO(nisse): Need advice on how to pass this. If
+    // conference_mode is per stream, we'd need the ssrc.

[pthatcher1, 2016/02/12 20:45:38]

Conference mode is not per-ssrc.

     send_params.options.conference_mode = rtc::Optional<bool>(true);
+#endif
   }
   if (!media_channel()->SetSendParameters(send_params)) {
     SafeSetError("Failed to set remote video description send parameters.",