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

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

Issue 1815033003: Add srcObject attribute of type MediaStream to HTMLMediaElement. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: wolenetz comments Created 4 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
Index: content/renderer/media/webmediaplayer_ms_unittest.cc
diff --git a/content/renderer/media/webmediaplayer_ms_unittest.cc b/content/renderer/media/webmediaplayer_ms_unittest.cc
index 7b5a4d1e88cd1f3d1b66aa170881063d9b996845..577e43632f7ae3f3d663f5af49a9fdc2ef2fd614 100644
--- a/content/renderer/media/webmediaplayer_ms_unittest.cc
+++ b/content/renderer/media/webmediaplayer_ms_unittest.cc
@@ -10,6 +10,7 @@
#include "content/renderer/render_frame_impl.h"
#include "media/base/test_helpers.h"
#include "media/base/video_frame.h"
+#include "third_party/WebKit/public/platform/WebMediaElementSource.h"
#include "third_party/WebKit/public/platform/WebMediaPlayer.h"
#include "third_party/WebKit/public/platform/WebMediaPlayerClient.h"
@@ -273,7 +274,7 @@ class MockRenderFactory : public MediaStreamRendererFactory {
message_loop_controller_(message_loop_controller) {}
scoped_refptr<VideoFrameProvider> 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,
@@ -285,7 +286,7 @@ class MockRenderFactory : public MediaStreamRendererFactory {
}
scoped_refptr<MediaStreamAudioRenderer> GetAudioRenderer(
- const GURL& url,
+ const blink::WebMediaStream& web_stream,
int render_frame_id,
const std::string& device_id,
const url::Origin& security_origin) override {
@@ -299,7 +300,7 @@ class MockRenderFactory : public MediaStreamRendererFactory {
};
scoped_refptr<VideoFrameProvider> MockRenderFactory::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,
@@ -435,7 +436,8 @@ MockVideoFrameProvider* WebMediaPlayerMSTest::LoadAndGetFrameProvider(
*this, DoNetworkStateChanged(blink::WebMediaPlayer::NetworkStateLoading));
EXPECT_CALL(
*this, DoReadyStateChanged(blink::WebMediaPlayer::ReadyStateHaveNothing));
- player_.load(blink::WebMediaPlayer::LoadTypeURL, blink::WebURL(),
+ player_.load(blink::WebMediaPlayer::LoadTypeURL,
+ blink::WebMediaElementSource(),
blink::WebMediaPlayer::CORSModeUnspecified);
compositor_ = player_.compositor_.get();
EXPECT_TRUE(!!compositor_);

Powered by Google App Engine
This is Rietveld 408576698