| Index: content/shell/renderer/layout_test/test_media_stream_renderer_factory.cc
|
| diff --git a/content/shell/renderer/layout_test/test_media_stream_renderer_factory.cc b/content/shell/renderer/layout_test/test_media_stream_renderer_factory.cc
|
| index 1248f77bd69b5e1f5d112dabd769f9bca264cdb0..ad796c127d0a0fab1b802eeb917f3bc6710be2a8 100644
|
| --- a/content/shell/renderer/layout_test/test_media_stream_renderer_factory.cc
|
| +++ b/content/shell/renderer/layout_test/test_media_stream_renderer_factory.cc
|
| @@ -4,7 +4,6 @@
|
|
|
| #include "content/shell/renderer/layout_test/test_media_stream_renderer_factory.h"
|
|
|
| -#include "content/shell/renderer/layout_test/test_media_stream_video_renderer.h"
|
| #include "media/media_features.h"
|
| #include "third_party/WebKit/public/platform/WebMediaStream.h"
|
| #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
|
| @@ -13,26 +12,6 @@
|
|
|
| using namespace blink;
|
|
|
| -namespace {
|
| -
|
| -static const int kVideoCaptureWidth = 352;
|
| -static const int kVideoCaptureHeight = 288;
|
| -static const int kVideoCaptureFrameDurationMs = 33;
|
| -
|
| -bool IsMockMediaStreamWithVideo(const WebMediaStream& web_stream) {
|
| -#if BUILDFLAG(ENABLE_WEBRTC)
|
| - if (web_stream.isNull())
|
| - return false;
|
| - WebVector<WebMediaStreamTrack> video_tracks;
|
| - web_stream.videoTracks(video_tracks);
|
| - return video_tracks.size() > 0;
|
| -#else
|
| - return false;
|
| -#endif
|
| -}
|
| -
|
| -} // namespace
|
| -
|
| namespace content {
|
|
|
| TestMediaStreamRendererFactory::TestMediaStreamRendererFactory() {}
|
| @@ -48,13 +27,7 @@ TestMediaStreamRendererFactory::GetVideoRenderer(
|
| const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
|
| const scoped_refptr<base::TaskRunner>& worker_task_runner,
|
| media::GpuVideoAcceleratorFactories* gpu_factories) {
|
| - if (!IsMockMediaStreamWithVideo(web_stream))
|
| - return NULL;
|
| -
|
| - return new TestMediaStreamVideoRenderer(
|
| - io_task_runner, gfx::Size(kVideoCaptureWidth, kVideoCaptureHeight),
|
| - base::TimeDelta::FromMilliseconds(kVideoCaptureFrameDurationMs), error_cb,
|
| - repaint_cb);
|
| + return NULL;
|
| }
|
|
|
| scoped_refptr<MediaStreamAudioRenderer>
|
|
|