| Index: talk/session/media/channelmanager_unittest.cc
|
| diff --git a/talk/session/media/channelmanager_unittest.cc b/talk/session/media/channelmanager_unittest.cc
|
| index 71493c8ff8be19d6e88b9792aa07c6094b01e174..98c79c30c2d3b822cdad693de24bf8471f8030a3 100644
|
| --- a/talk/session/media/channelmanager_unittest.cc
|
| +++ b/talk/session/media/channelmanager_unittest.cc
|
| @@ -28,7 +28,6 @@
|
| #include "talk/app/webrtc/mediacontroller.h"
|
| #include "talk/media/base/fakecapturemanager.h"
|
| #include "talk/media/base/fakemediaengine.h"
|
| -#include "talk/media/base/fakemediaprocessor.h"
|
| #include "talk/media/base/testutils.h"
|
| #include "talk/media/devices/fakedevicemanager.h"
|
| #include "talk/media/webrtc/fakewebrtccall.h"
|
| @@ -529,45 +528,6 @@ TEST_F(ChannelManagerTest, SetLogging) {
|
| EXPECT_STREQ("test-video", fme_->video_logfilter().c_str());
|
| }
|
|
|
| -// Test that the Video/Voice Processors register and unregister
|
| -TEST_F(ChannelManagerTest, RegisterProcessors) {
|
| - cricket::FakeMediaProcessor fmp;
|
| - EXPECT_TRUE(cm_->Init());
|
| - EXPECT_FALSE(fme_->voice_processor_registered(cricket::MPD_TX));
|
| - EXPECT_FALSE(fme_->voice_processor_registered(cricket::MPD_RX));
|
| -
|
| - EXPECT_FALSE(fme_->voice_processor_registered(cricket::MPD_TX));
|
| - EXPECT_FALSE(fme_->voice_processor_registered(cricket::MPD_RX));
|
| -
|
| - EXPECT_FALSE(fme_->voice_processor_registered(cricket::MPD_TX));
|
| - EXPECT_FALSE(fme_->voice_processor_registered(cricket::MPD_RX));
|
| -
|
| - EXPECT_TRUE(cm_->RegisterVoiceProcessor(1,
|
| - &fmp,
|
| - cricket::MPD_RX));
|
| - EXPECT_FALSE(fme_->voice_processor_registered(cricket::MPD_TX));
|
| - EXPECT_TRUE(fme_->voice_processor_registered(cricket::MPD_RX));
|
| -
|
| -
|
| - EXPECT_TRUE(cm_->UnregisterVoiceProcessor(1,
|
| - &fmp,
|
| - cricket::MPD_RX));
|
| - EXPECT_FALSE(fme_->voice_processor_registered(cricket::MPD_TX));
|
| - EXPECT_FALSE(fme_->voice_processor_registered(cricket::MPD_RX));
|
| -
|
| - EXPECT_TRUE(cm_->RegisterVoiceProcessor(1,
|
| - &fmp,
|
| - cricket::MPD_TX));
|
| - EXPECT_TRUE(fme_->voice_processor_registered(cricket::MPD_TX));
|
| - EXPECT_FALSE(fme_->voice_processor_registered(cricket::MPD_RX));
|
| -
|
| - EXPECT_TRUE(cm_->UnregisterVoiceProcessor(1,
|
| - &fmp,
|
| - cricket::MPD_TX));
|
| - EXPECT_FALSE(fme_->voice_processor_registered(cricket::MPD_TX));
|
| - EXPECT_FALSE(fme_->voice_processor_registered(cricket::MPD_RX));
|
| -}
|
| -
|
| TEST_F(ChannelManagerTest, SetVideoRtxEnabled) {
|
| std::vector<VideoCodec> codecs;
|
| const VideoCodec rtx_codec(96, "rtx", 0, 0, 0, 0);
|
|
|