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

Unified Diff: content/shell/renderer/layout_test/test_media_stream_renderer_factory.cc

Issue 2780353003: Remove TestMediaStreamVideoRenderer usage from LayoutTests.
Patch Set: Created 3 years, 9 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/shell/BUILD.gn ('k') | content/shell/renderer/layout_test/test_media_stream_video_renderer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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>
« no previous file with comments | « content/shell/BUILD.gn ('k') | content/shell/renderer/layout_test/test_media_stream_video_renderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698