Remove media sinks from Channel.

talk/session/media/channel_unittest.cc

 /*
  * libjingle
  * Copyright 2009 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 17 matching lines @@
 #include "talk/media/base/fakemediaengine.h"
 #include "talk/media/base/fakertp.h"
 #include "talk/media/base/fakescreencapturerfactory.h"
 #include "talk/media/base/fakevideocapturer.h"
 #include "talk/media/base/mediachannel.h"
 #include "talk/media/base/rtpdump.h"
 #include "talk/media/base/screencastid.h"
 #include "talk/media/base/testutils.h"
 #include "webrtc/p2p/base/fakesession.h"
 #include "talk/session/media/channel.h"
-#include "talk/session/media/mediarecorder.h"
 #include "talk/session/media/typingmonitor.h"
 #include "webrtc/base/fileutils.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/pathutils.h"
 #include "webrtc/base/signalthread.h"
 #include "webrtc/base/ssladapter.h"
 #include "webrtc/base/sslidentity.h"
 #include "webrtc/base/window.h"
@@ skipping 1502 matching lines @@
     channel1_->StopMediaMonitor();
     channel2_->StopMediaMonitor();
     // Ensure a restart of a stopped monitor works.
     channel1_->StartMediaMonitor(100);
     EXPECT_TRUE_WAIT(media_info_callbacks1_ > 0, kTimeout);
     channel1_->StopMediaMonitor();
     // Ensure stopping a stopped monitor is OK.
     channel1_->StopMediaMonitor();
   }
 
-  void TestMediaSinks() {
-    CreateChannels(0, 0);
-    EXPECT_TRUE(SendInitiate());
-    EXPECT_TRUE(SendAccept());
-    EXPECT_FALSE(channel1_->HasSendSinks(cricket::SINK_POST_CRYPTO));
-    EXPECT_FALSE(channel1_->HasRecvSinks(cricket::SINK_POST_CRYPTO));
-    EXPECT_FALSE(channel1_->HasSendSinks(cricket::SINK_PRE_CRYPTO));
-    EXPECT_FALSE(channel1_->HasRecvSinks(cricket::SINK_PRE_CRYPTO));
-
-    rtc::Pathname path;
-    EXPECT_TRUE(rtc::Filesystem::GetTemporaryFolder(path, true, NULL));
-    path.SetFilename("sink-test.rtpdump");
-    rtc::scoped_ptr<cricket::RtpDumpSink> sink(
-        new cricket::RtpDumpSink(Open(path.pathname())));
-    sink->set_packet_filter(cricket::PF_ALL);
-    EXPECT_TRUE(sink->Enable(true));
-    channel1_->RegisterSendSink(
-        sink.get(), &cricket::RtpDumpSink::OnPacket, cricket::SINK_POST_CRYPTO);
-    EXPECT_TRUE(channel1_->HasSendSinks(cricket::SINK_POST_CRYPTO));
-    EXPECT_FALSE(channel1_->HasRecvSinks(cricket::SINK_POST_CRYPTO));
-    EXPECT_FALSE(channel1_->HasSendSinks(cricket::SINK_PRE_CRYPTO));
-    EXPECT_FALSE(channel1_->HasRecvSinks(cricket::SINK_PRE_CRYPTO));
-
-    // The first packet is recorded with header + data.
-    EXPECT_TRUE(SendRtp1());
-    // The second packet is recorded with header only.
-    sink->set_packet_filter(cricket::PF_RTPHEADER);
-    EXPECT_TRUE(SendRtp1());
-    // The third packet is not recorded since sink is disabled.
-    EXPECT_TRUE(sink->Enable(false));
-    EXPECT_TRUE(SendRtp1());
-     // The fourth packet is not recorded since sink is unregistered.
-    EXPECT_TRUE(sink->Enable(true));
-    channel1_->UnregisterSendSink(sink.get(), cricket::SINK_POST_CRYPTO);
-    EXPECT_TRUE(SendRtp1());
-    sink.reset();  // This will close the file.
-
-    // Read the recorded file and verify two packets.
-    rtc::scoped_ptr<rtc::StreamInterface> stream(
-        rtc::Filesystem::OpenFile(path, "rb"));
-
-    cricket::RtpDumpReader reader(stream.get());
-    cricket::RtpDumpPacket packet;
-    EXPECT_EQ(rtc::SR_SUCCESS, reader.ReadPacket(&packet));
-    std::string read_packet(reinterpret_cast<const char*>(&packet.data[0]),
-        packet.data.size());
-    EXPECT_EQ(rtp_packet_, read_packet);
-
-    EXPECT_EQ(rtc::SR_SUCCESS, reader.ReadPacket(&packet));
-    size_t len = 0;
-    packet.GetRtpHeaderLen(&len);
-    EXPECT_EQ(len, packet.data.size());
-    EXPECT_EQ(0, memcmp(&packet.data[0], rtp_packet_.c_str(), len));
-
-    EXPECT_EQ(rtc::SR_EOS, reader.ReadPacket(&packet));
-
-    // Delete the file for media recording.
-    stream.reset();
-    EXPECT_TRUE(rtc::Filesystem::DeleteFile(path));
-  }
-
   void TestSetContentFailure() {
     CreateChannels(0, 0);
     typename T::Content content;
     cricket::SessionDescription* sdesc_loc = new cricket::SessionDescription();
     cricket::SessionDescription* sdesc_rem = new cricket::SessionDescription();
 
     // Set up the session description.
     CreateContent(0, kPcmuCodec, kH264Codec, &content);
     sdesc_loc->AddContent(cricket::CN_AUDIO, cricket::NS_JINGLE_RTP,
                           new cricket::AudioContentDescription());
@@ skipping 677 matching lines @@
 
   ASSERT_EQ(3U, media_channel1_->dtmf_info_queue().size());
   EXPECT_TRUE(CompareDtmfInfo(media_channel1_->dtmf_info_queue()[0],
                               1, 3, 100, cricket::DF_SEND));
   EXPECT_TRUE(CompareDtmfInfo(media_channel1_->dtmf_info_queue()[1],
                               2, 5, 110, cricket::DF_PLAY));
   EXPECT_TRUE(CompareDtmfInfo(media_channel1_->dtmf_info_queue()[2],
                               3, 7, 120, cricket::DF_PLAY | cricket::DF_SEND));
 }
 
-TEST_F(VoiceChannelTest, TestMediaSinks) {
-  Base::TestMediaSinks();
-}
-
 TEST_F(VoiceChannelTest, TestSetContentFailure) {
   Base::TestSetContentFailure();
 }
 
 TEST_F(VoiceChannelTest, TestSendTwoOffers) {
   Base::TestSendTwoOffers();
 }
 
 TEST_F(VoiceChannelTest, TestReceiveTwoOffers) {
   Base::TestReceiveTwoOffers();
@@ skipping 337 matching lines @@
 }
 
 TEST_F(VideoChannelTest, SendWithWritabilityLoss) {
   Base::SendWithWritabilityLoss();
 }
 
 TEST_F(VideoChannelTest, TestMediaMonitor) {
   Base::TestMediaMonitor();
 }
 
-TEST_F(VideoChannelTest, TestMediaSinks) {
-  Base::TestMediaSinks();
-}
-
 TEST_F(VideoChannelTest, TestSetContentFailure) {
   Base::TestSetContentFailure();
 }
 
 TEST_F(VideoChannelTest, TestSendTwoOffers) {
   Base::TestSendTwoOffers();
 }
 
 TEST_F(VideoChannelTest, TestReceiveTwoOffers) {
   Base::TestReceiveTwoOffers();
@@ skipping 306 matching lines @@
   };
   rtc::Buffer payload(data, 3);
   cricket::SendDataResult result;
   ASSERT_TRUE(media_channel1_->SendData(params, payload, &result));
   EXPECT_EQ(params.ssrc,
             media_channel1_->last_sent_data_params().ssrc);
   EXPECT_EQ("foo", media_channel1_->last_sent_data());
 }
 
 // TODO(pthatcher): TestSetReceiver?