Remove media sinks from Channel.

talk/session/media/channel.h

Index: talk/session/media/channel.h
diff --git a/talk/session/media/channel.h b/talk/session/media/channel.h
index 904777e1754a2db5d2fea525b7aca066fc713c11..bb2dffdc905dfd7024ab017f567a3283d284efdc 100644
--- a/talk/session/media/channel.h
+++ b/talk/session/media/channel.h
@@ -148,72 +148,6 @@ class BaseChannel
     srtp_filter_.set_signal_silent_time(silent_time);
   }
 
-  template <class T>
-  void RegisterSendSink(T* sink,
-                        void (T::*OnPacket)(const void*, size_t, bool),
-                        SinkType type) {
-    rtc::CritScope cs(&signal_send_packet_cs_);
-    if (SINK_POST_CRYPTO == type) {
-      SignalSendPacketPostCrypto.disconnect(sink);
-      SignalSendPacketPostCrypto.connect(sink, OnPacket);
-    } else {
-      SignalSendPacketPreCrypto.disconnect(sink);
-      SignalSendPacketPreCrypto.connect(sink, OnPacket);
-    }
-  }
-
-  void UnregisterSendSink(sigslot::has_slots<>* sink,
-                          SinkType type) {
-    rtc::CritScope cs(&signal_send_packet_cs_);
-    if (SINK_POST_CRYPTO == type) {
-      SignalSendPacketPostCrypto.disconnect(sink);
-    } else {
-      SignalSendPacketPreCrypto.disconnect(sink);
-    }
-  }
-
-  bool HasSendSinks(SinkType type) {
-    rtc::CritScope cs(&signal_send_packet_cs_);
-    if (SINK_POST_CRYPTO == type) {
-      return !SignalSendPacketPostCrypto.is_empty();
-    } else {
-      return !SignalSendPacketPreCrypto.is_empty();
-    }
-  }
-
-  template <class T>
-  void RegisterRecvSink(T* sink,
-                        void (T::*OnPacket)(const void*, size_t, bool),
-                        SinkType type) {
-    rtc::CritScope cs(&signal_recv_packet_cs_);
-    if (SINK_POST_CRYPTO == type) {
-      SignalRecvPacketPostCrypto.disconnect(sink);
-      SignalRecvPacketPostCrypto.connect(sink, OnPacket);
-    } else {
-      SignalRecvPacketPreCrypto.disconnect(sink);
-      SignalRecvPacketPreCrypto.connect(sink, OnPacket);
-    }
-  }
-
-  void UnregisterRecvSink(sigslot::has_slots<>* sink,
-                          SinkType type) {
-    rtc::CritScope cs(&signal_recv_packet_cs_);
-    if (SINK_POST_CRYPTO == type) {
-      SignalRecvPacketPostCrypto.disconnect(sink);
-    } else {
-      SignalRecvPacketPreCrypto.disconnect(sink);
-    }
-  }
-
-  bool HasRecvSinks(SinkType type) {
-    rtc::CritScope cs(&signal_recv_packet_cs_);
-    if (SINK_POST_CRYPTO == type) {
-      return !SignalRecvPacketPostCrypto.is_empty();
-    } else {
-      return !SignalRecvPacketPreCrypto.is_empty();
-    }
-  }
-
   BundleFilter* bundle_filter() { return &bundle_filter_; }
 
   const std::vector<StreamParams>& local_streams() const {
@@ -377,13 +311,6 @@ class BaseChannel
   }
 
  private:
-  sigslot::signal3<const void*, size_t, bool> SignalSendPacketPreCrypto;
-  sigslot::signal3<const void*, size_t, bool> SignalSendPacketPostCrypto;
-  sigslot::signal3<const void*, size_t, bool> SignalRecvPacketPreCrypto;
-  sigslot::signal3<const void*, size_t, bool> SignalRecvPacketPostCrypto;
-  rtc::CriticalSection signal_send_packet_cs_;
-  rtc::CriticalSection signal_recv_packet_cs_;
-
   rtc::Thread* worker_thread_;
   MediaEngineInterface* media_engine_;
   BaseSession* session_;