Commit cacc2c35 authored by alokp's avatar alokp Committed by Commit bot

Disable WebRTC CaptureFromMediaElement test when using mojo renderer.

BUG=641559

Review-Url: https://codereview.chromium.org/2283163002
Cr-Commit-Position: refs/heads/master@{#415362}
parent 67a9b079
...@@ -8,10 +8,17 @@ ...@@ -8,10 +8,17 @@
#include "content/public/common/content_switches.h" #include "content/public/common/content_switches.h"
#include "media/base/test_data_util.h" #include "media/base/test_data_util.h"
#if defined(ENABLE_MOJO_RENDERER)
// Remote mojo renderer does not send audio/video frames back to the renderer
// process and hence does not support capture: crbug.com/641559.
#define DISABLE_CAPTURE_FROM_MEDIA_ELEMENT_TESTS 1
#endif // ENABLE_MOJO_RENDERER
namespace { namespace {
static const char kCanvasTestHtmlPage[] = "/media/canvas_capture_color.html"; static const char kCanvasTestHtmlPage[] = "/media/canvas_capture_color.html";
#if !defined(DISABLE_CAPTURE_FROM_MEDIA_ELEMENT_TESTS)
static const char kVideoAudioHtmlFile[] = static const char kVideoAudioHtmlFile[] =
"/media/video_audio_element_capture_test.html"; "/media/video_audio_element_capture_test.html";
...@@ -26,6 +33,7 @@ static struct FileAndTypeParameters { ...@@ -26,6 +33,7 @@ static struct FileAndTypeParameters {
{true, true, false, "bear-320x240.webm"}, {true, true, false, "bear-320x240.webm"},
{false, true, true, "bear-320x240-audio-only.webm"}, {false, true, true, "bear-320x240-audio-only.webm"},
}; };
#endif // DISABLE_CAPTURE_FROM_MEDIA_ELEMENT_TESTS
} // namespace } // namespace
...@@ -60,6 +68,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcCaptureFromElementBrowserTest, ...@@ -60,6 +68,7 @@ IN_PROC_BROWSER_TEST_F(WebRtcCaptureFromElementBrowserTest,
MakeTypicalCall("testCanvasCaptureColors();", kCanvasTestHtmlPage); MakeTypicalCall("testCanvasCaptureColors();", kCanvasTestHtmlPage);
} }
#if !defined(DISABLE_CAPTURE_FROM_MEDIA_ELEMENT_TESTS)
IN_PROC_BROWSER_TEST_P(WebRtcCaptureFromElementBrowserTest, IN_PROC_BROWSER_TEST_P(WebRtcCaptureFromElementBrowserTest,
CaptureFromMediaElement) { CaptureFromMediaElement) {
MakeTypicalCall( MakeTypicalCall(
...@@ -74,4 +83,5 @@ IN_PROC_BROWSER_TEST_P(WebRtcCaptureFromElementBrowserTest, ...@@ -74,4 +83,5 @@ IN_PROC_BROWSER_TEST_P(WebRtcCaptureFromElementBrowserTest,
INSTANTIATE_TEST_CASE_P(, INSTANTIATE_TEST_CASE_P(,
WebRtcCaptureFromElementBrowserTest, WebRtcCaptureFromElementBrowserTest,
testing::ValuesIn(kFileAndTypeParameters)); testing::ValuesIn(kFileAndTypeParameters));
#endif // !defined(DISABLE_CAPTURE_FROM_MEDIA_ELEMENT_TESTS)
} // namespace content } // namespace content
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment