Move bundle filter from BaseChannel to RtpTransport.

webrtc/pc/channel.h

Index: webrtc/pc/channel.h
diff --git a/webrtc/pc/channel.h b/webrtc/pc/channel.h
index 48259e5fd9d7732b94c4deaa817265edf5b85b59..2694977c99a6e1705a592c86caa3cfddbce5eb6f 100644
--- a/webrtc/pc/channel.h
+++ b/webrtc/pc/channel.h
@@ -149,8 +149,6 @@ class BaseChannel
   // For ConnectionStatsGetter, used by ConnectionMonitor
   bool GetConnectionStats(ConnectionInfos* infos) override;
 
-  BundleFilter* bundle_filter() { return &bundle_filter_; }
-
   const std::vector<StreamParams>& local_streams() const {
     return local_streams_;
   }
@@ -198,6 +196,9 @@ class BaseChannel
   // This function returns true if we require SRTP for call setup.
   bool srtp_required_for_testing() const { return srtp_required_; }
 
+  // Public for testing.
+  bool HandlesPayloadType(int payload_type);

[Taylor Brandstetter, 2017/05/17 02:12:42]

const?

[Zach Stein, 2017/05/30 19:08:38]

Done.

+
  protected:
   virtual MediaChannel* media_channel() const { return media_channel_; }
 
@@ -357,6 +358,8 @@ class BaseChannel
     return worker_thread_->Invoke<bool>(posted_from, functor);
   }
 
+  void AddHandledPayloadType(int payload_type);
+
  private:
   bool InitNetwork_n(DtlsTransportInternal* rtp_dtls_transport,
                      DtlsTransportInternal* rtcp_dtls_transport,
@@ -394,7 +397,6 @@ class BaseChannel
   std::vector<std::pair<rtc::Socket::Option, int> > rtcp_socket_options_;
   SrtpFilter srtp_filter_;
   RtcpMuxFilter rtcp_mux_filter_;
-  BundleFilter bundle_filter_;
   bool writable_ = false;
   bool was_ever_writable_ = false;
   bool has_received_packet_ = false;