diff options
| author | wuchengli@chromium.org <wuchengli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-01 04:17:32 +0000 |
|---|---|---|
| committer | wuchengli@chromium.org <wuchengli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-01 04:17:32 +0000 |
| commit | b3d080fcfc874742ab6dd8ca8f7ea8acced4da5b (patch) | |
| tree | 83b285f36bff466bf5169ad551cc26092ae552bb /content/renderer/media/media_stream_impl_unittest.cc | |
| parent | dcc87fb5d6e2e3758054d8bcf473f3d39daafa87 (diff) | |
| download | chromium_src-b3d080fcfc874742ab6dd8ca8f7ea8acced4da5b.zip chromium_src-b3d080fcfc874742ab6dd8ca8f7ea8acced4da5b.tar.gz chromium_src-b3d080fcfc874742ab6dd8ca8f7ea8acced4da5b.tar.bz2 | |
Delete old RTCVideoDecoder code path.
Remove leftover codepath from the pre-WebMediaPlayerMS days.
BUG=chromium:177572
TEST=Try apprtc.appspot.com/?debug=loopback on link.
Review URL: https://chromiumcodereview.appspot.com/12320078
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185460 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/media/media_stream_impl_unittest.cc')
| -rw-r--r-- | content/renderer/media/media_stream_impl_unittest.cc | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/content/renderer/media/media_stream_impl_unittest.cc b/content/renderer/media/media_stream_impl_unittest.cc index 5fe8650..3cf0cc4 100644 --- a/content/renderer/media/media_stream_impl_unittest.cc +++ b/content/renderer/media/media_stream_impl_unittest.cc @@ -3,14 +3,12 @@ // found in the LICENSE file. #include "base/memory/scoped_ptr.h" -#include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "content/renderer/media/media_stream_extra_data.h" #include "content/renderer/media/media_stream_impl.h" #include "content/renderer/media/mock_media_stream_dependency_factory.h" #include "content/renderer/media/mock_media_stream_dispatcher.h" #include "content/renderer/media/video_capture_impl_manager.h" -#include "media/base/video_decoder.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStream.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamSource.h" @@ -159,22 +157,12 @@ class MediaStreamImplTest : public ::testing::Test { TEST_F(MediaStreamImplTest, LocalMediaStream) { // Test a stream with both audio and video. WebKit::WebMediaStream mixed_desc = RequestLocalMediaStream(true, true); - // Create a renderer for the stream. - scoped_refptr<media::VideoDecoder> mixed_decoder( - ms_impl_->GetVideoDecoder(GURL(), base::MessageLoopProxy::current())); - EXPECT_TRUE(mixed_decoder.get() != NULL); // Test a stream with audio only. WebKit::WebMediaStream audio_desc = RequestLocalMediaStream(true, false); - scoped_refptr<media::VideoDecoder> audio_decoder( - ms_impl_->GetVideoDecoder(GURL(), base::MessageLoopProxy::current())); - EXPECT_TRUE(audio_decoder.get() == NULL); // Test a stream with video only. WebKit::WebMediaStream video_desc = RequestLocalMediaStream(false, true); - scoped_refptr<media::VideoDecoder> video_decoder( - ms_impl_->GetVideoDecoder(GURL(), base::MessageLoopProxy::current())); - EXPECT_TRUE(video_decoder.get() != NULL); // Stop generated local streams. ms_impl_->OnLocalMediaStreamStop(mixed_desc.label().utf8()); |