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

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

Issue 1815033003: Add srcObject attribute of type MediaStream to HTMLMediaElement. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: philipj's comments Created 4 years, 8 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
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 758312eccbacf51f147d2228a6b4d3ec71e3eccf..641b38cb8a994914988ea60f7a4d8b5720c80ac3 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
@@ -18,14 +18,12 @@ static const int kVideoCaptureWidth = 352;
static const int kVideoCaptureHeight = 288;
static const int kVideoCaptureFrameDurationMs = 33;
-bool IsMockMediaStreamWithVideo(const WebURL& url) {
+bool IsMockMediaStreamWithVideo(const WebMediaStream& web_stream) {
#if ENABLE_WEBRTC
- WebMediaStream descriptor(
- WebMediaStreamRegistry::lookupMediaStreamDescriptor(url));
- if (descriptor.isNull())
+ if (web_stream.isNull())
return false;
WebVector<WebMediaStreamTrack> video_tracks;
- descriptor.videoTracks(video_tracks);
+ web_stream.videoTracks(video_tracks);
return video_tracks.size() > 0;
#else
return false;
@@ -42,13 +40,13 @@ TestMediaStreamRendererFactory::~TestMediaStreamRendererFactory() {}
scoped_refptr<VideoFrameProvider>
TestMediaStreamRendererFactory::GetVideoFrameProvider(
- const GURL& url,
+ const blink::WebMediaStream& web_stream,
const base::Closure& error_cb,
const VideoFrameProvider::RepaintCB& repaint_cb,
const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
const scoped_refptr<base::TaskRunner>& worker_task_runner,
media::GpuVideoAcceleratorFactories* gpu_factories) {
- if (!IsMockMediaStreamWithVideo(url))
+ if (!IsMockMediaStreamWithVideo(web_stream))
return NULL;
return new TestVideoFrameProvider(
@@ -60,7 +58,7 @@ TestMediaStreamRendererFactory::GetVideoFrameProvider(
scoped_refptr<MediaStreamAudioRenderer>
TestMediaStreamRendererFactory::GetAudioRenderer(
- const GURL& url,
+ const blink::WebMediaStream& web_stream,
int render_frame_id,
const std::string& device_id,
const url::Origin& security_origin) {

Powered by Google App Engine
This is Rietveld 408576698