Drop VideoOptions from VideoSendParameters.

webrtc/media/base/fakemediaengine.h

 /*
  *  Copyright (c) 2004 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 423 matching lines @@
   bool rendering() const { return playout(); }
   const VideoOptions& options() const { return options_; }
   const std::map<uint32_t, rtc::VideoSinkInterface<VideoFrame>*>& sinks()
       const {
     return sinks_;
   }
   int max_bps() const { return max_bps_; }
   virtual bool SetSendParameters(const VideoSendParameters& params) {
     return (SetSendCodecs(params.codecs) &&
             SetSendRtpHeaderExtensions(params.extensions) &&
-            SetMaxSendBandwidth(params.max_bandwidth_bps) &&
-            SetOptions(params.options));
+            SetMaxSendBandwidth(params.max_bandwidth_bps));
   }
 
   virtual bool SetRecvParameters(const VideoRecvParameters& params) {
     return (SetRecvCodecs(params.codecs) &&
             SetRecvRtpHeaderExtensions(params.extensions));
   }
   virtual bool AddSendStream(const StreamParams& sp) {
     return RtpHelper<VideoMediaChannel>::AddSendStream(sp);
   }
   virtual bool RemoveSendStream(uint32_t ssrc) {
@@ skipping 80 matching lines @@
 
   FakeVideoEngine* engine_;
   std::vector<VideoCodec> recv_codecs_;
   std::vector<VideoCodec> send_codecs_;
   std::map<uint32_t, rtc::VideoSinkInterface<VideoFrame>*> sinks_;
   std::map<uint32_t, VideoCapturer*> capturers_;
   VideoOptions options_;
   int max_bps_;
 };
 
+class DataOptions {};

[pbos-webrtc, 2016/03/15 18:40:15]

Is this necessary? If so put a comment.

[nisse-webrtc, 2016/03/16 08:17:03]

The DataTraits templatery in channel_unittest.cc wants it. I'm adding a comment.

 class FakeDataMediaChannel : public RtpHelper<DataMediaChannel> {
  public:
   explicit FakeDataMediaChannel(void* unused, const DataOptions& options)
       : send_blocked_(false), max_bps_(-1) {}
   ~FakeDataMediaChannel() {}
   const std::vector<DataCodec>& recv_codecs() const { return recv_codecs_; }
   const std::vector<DataCodec>& send_codecs() const { return send_codecs_; }
   const std::vector<DataCodec>& codecs() const { return send_codecs(); }
   int max_bps() const { return max_bps_; }
 
@@ skipping 310 matching lines @@
 
  private:
   std::vector<FakeDataMediaChannel*> channels_;
   std::vector<DataCodec> data_codecs_;
   DataChannelType last_channel_type_;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_BASE_FAKEMEDIAENGINE_H_