Remove media sinks from Channel.

talk/session/media/channel.cc

Index: talk/session/media/channel.cc
diff --git a/talk/session/media/channel.cc b/talk/session/media/channel.cc
index 95f5bc1e82da57f4ac269609b7bc724b5002e804..0134d343d2a7d419916899a016dd995dae8f177d 100644
--- a/talk/session/media/channel.cc
+++ b/talk/session/media/channel.cc
@@ -502,12 +502,6 @@ bool BaseChannel::SendPacket(bool rtcp, rtc::Buffer* packet,
     return false;
   }
 
-  // Signal to the media sink before protecting the packet.
-  {
-    rtc::CritScope cs(&signal_send_packet_cs_);
-    SignalSendPacketPreCrypto(packet->data(), packet->size(), rtcp);
-  }
-
   rtc::PacketOptions options(dscp);
   // Protect if needed.
   if (srtp_filter_.IsActive()) {
@@ -576,12 +570,6 @@ bool BaseChannel::SendPacket(bool rtcp, rtc::Buffer* packet,
     return false;
   }
 
-  // Signal to the media sink after protecting the packet.
-  {
-    rtc::CritScope cs(&signal_send_packet_cs_);
-    SignalSendPacketPostCrypto(packet->data(), packet->size(), rtcp);
-  }
-
   // Bon voyage.
   int ret =
       channel->SendPacket(packet->data<char>(), packet->size(), options,
@@ -622,12 +610,6 @@ void BaseChannel::HandlePacket(bool rtcp, rtc::Buffer* packet,
     signaling_thread()->Post(this, MSG_FIRSTPACKETRECEIVED);
   }
 
-  // Signal to the media sink before unprotecting the packet.
-  {
-    rtc::CritScope cs(&signal_recv_packet_cs_);
-    SignalRecvPacketPostCrypto(packet->data(), packet->size(), rtcp);
-  }
-
   // Unprotect the packet, if needed.
   if (srtp_filter_.IsActive()) {
     char* data = packet->data<char>();
@@ -673,12 +655,6 @@ void BaseChannel::HandlePacket(bool rtcp, rtc::Buffer* packet,
     return;
   }
 
-  // Signal to the media sink after unprotecting the packet.
-  {
-    rtc::CritScope cs(&signal_recv_packet_cs_);
-    SignalRecvPacketPreCrypto(packet->data(), packet->size(), rtcp);
-  }
-
   // Push it down to the media channel.
   if (!rtcp) {
     media_channel_->OnPacketReceived(packet, packet_time);