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

Unified Diff: content/browser/media/webrtc/webrtc_capture_from_element_browsertest.cc

Issue 2104643002: MediaCaptureFromElement: add content_browsertests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Allow <video>/<audio>.play() for tests when not initiated by user gesture. Created 4 years, 6 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/browser/media/webrtc/webrtc_canvas_capture_browsertest.cc ('k') | content/content_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/webrtc/webrtc_capture_from_element_browsertest.cc
diff --git a/content/browser/media/webrtc/webrtc_canvas_capture_browsertest.cc b/content/browser/media/webrtc/webrtc_capture_from_element_browsertest.cc
similarity index 18%
rename from content/browser/media/webrtc/webrtc_canvas_capture_browsertest.cc
rename to content/browser/media/webrtc/webrtc_capture_from_element_browsertest.cc
index 107ead30aae23fea218eb65f5770a3249cc2f59c..67cc284a47e4ef483a99433c2e9b7e5020e7c1a8 100644
--- a/content/browser/media/webrtc/webrtc_canvas_capture_browsertest.cc
+++ b/content/browser/media/webrtc/webrtc_capture_from_element_browsertest.cc
@@ -3,33 +3,75 @@
// found in the LICENSE file.
#include "base/command_line.h"
-#include "base/macros.h"
-#include "build/build_config.h"
-#include "content/public/test/browser_test_utils.h"
-#include "content/public/test/content_browser_test_utils.h"
+#include "base/strings/stringprintf.h"
+#include "content/public/common/content_switches.h"
#include "content/test/webrtc_content_browsertest_base.h"
+#include "media/base/test_data_util.h"
namespace {
static const char kCanvasTestHtmlPage[] = "/media/canvas_capture_color.html";
+static const char kVideoAudioHtmlFile[] =
+ "/media/video_audio_element_capture_test.html";
+
+static struct FileAndTypeParameters {
+ bool has_video;
+ bool has_audio;
+ bool use_audio_tag;
+ std::string filename;
+} const kFileAndTypeParameters[] = {
+ {true, false, false, "bear-320x240-video-only.webm"},
+ {false, true, false, "bear-320x240-audio-only.webm"},
+ {true, true, false, "bear-320x240.webm"},
+ {false, true, true, "bear-320x240-audio-only.webm"},
+};
+
} // namespace
namespace content {
-// This class tests the rgba color values produced by canvas capture.
-class WebRtcCanvasCaptureTest : public WebRtcContentBrowserTest {
+// This class is the browser tests for Media Capture from DOM Elements API,
+// which allows for creation of a MediaStream out of a <canvas>, <video> or
+// <audio> element.
+class WebRtcCaptureFromElementBrowserTest
+ : public WebRtcContentBrowserTest,
+ public testing::WithParamInterface<struct FileAndTypeParameters> {
public:
- WebRtcCanvasCaptureTest() {}
- ~WebRtcCanvasCaptureTest() override {}
+ WebRtcCaptureFromElementBrowserTest() {}
+ ~WebRtcCaptureFromElementBrowserTest() override {}
+
+ void SetUpCommandLine(base::CommandLine* command_line) override {
+ WebRtcContentBrowserTest::SetUpCommandLine(command_line);
+ base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+ switches::kEnableBlinkFeatures, "MediaCaptureFromVideo");
+
+ // Allow <video>/<audio>.play() when not initiated by user gesture.
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
+ switches::kDisableGestureRequirementForMediaPlayback);
+ }
private:
- DISALLOW_COPY_AND_ASSIGN(WebRtcCanvasCaptureTest);
+ DISALLOW_COPY_AND_ASSIGN(WebRtcCaptureFromElementBrowserTest);
};
-IN_PROC_BROWSER_TEST_F(WebRtcCanvasCaptureTest,
- VerifyCanvasCaptureColor) {
+IN_PROC_BROWSER_TEST_F(WebRtcCaptureFromElementBrowserTest,
+ VerifyCanvasCaptureColor) {
MakeTypicalCall("testCanvasCaptureColors();", kCanvasTestHtmlPage);
}
+IN_PROC_BROWSER_TEST_P(WebRtcCaptureFromElementBrowserTest,
+ CaptureFromMediaElement) {
+ MakeTypicalCall(
+ base::StringPrintf("testCaptureFromMediaElement(\"%s\", %d, %d, %d);",
+ GetParam().filename.c_str(),
+ GetParam().has_video,
+ GetParam().has_audio,
+ GetParam().use_audio_tag),
+ kVideoAudioHtmlFile);
+}
+
+INSTANTIATE_TEST_CASE_P(,
+ WebRtcCaptureFromElementBrowserTest,
+ testing::ValuesIn(kFileAndTypeParameters));
} // namespace content
« no previous file with comments | « content/browser/media/webrtc/webrtc_canvas_capture_browsertest.cc ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698