Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1610)

Unified Diff: content/renderer/media/media_stream_impl_unittest.cc

Issue 12320078: Delete old RTCVideoDecoder code path. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: make the line no longer than 80 chars Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/media/media_stream_impl.cc ('k') | content/renderer/media/rtc_video_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/media_stream_impl_unittest.cc
diff --git a/content/renderer/media/media_stream_impl_unittest.cc b/content/renderer/media/media_stream_impl_unittest.cc
index 5fe86506773ad7d422a8d016eb5a1d734543a916..3cf0cc4a59b7c812025706118900ca919b75dc03 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());
« no previous file with comments | « content/renderer/media/media_stream_impl.cc ('k') | content/renderer/media/rtc_video_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698