summaryrefslogtreecommitdiffstats
path: root/dom/media/mediacontrol/tests
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-19 01:13:27 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-19 01:13:27 +0000
commit40a355a42d4a9444dc753c04c6608dade2f06a23 (patch)
tree871fc667d2de662f171103ce5ec067014ef85e61 /dom/media/mediacontrol/tests
parentAdding upstream version 124.0.1. (diff)
downloadfirefox-upstream/125.0.1.tar.xz
firefox-upstream/125.0.1.zip
Adding upstream version 125.0.1.upstream/125.0.1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'dom/media/mediacontrol/tests')
-rw-r--r--dom/media/mediacontrol/tests/browser/browser_media_control_before_media_starts.js2
-rw-r--r--dom/media/mediacontrol/tests/gtest/MediaKeyListenerTest.h2
-rw-r--r--dom/media/mediacontrol/tests/gtest/moz.build2
3 files changed, 3 insertions, 3 deletions
diff --git a/dom/media/mediacontrol/tests/browser/browser_media_control_before_media_starts.js b/dom/media/mediacontrol/tests/browser/browser_media_control_before_media_starts.js
index 292c2f521f..a0c75bfa7c 100644
--- a/dom/media/mediacontrol/tests/browser/browser_media_control_before_media_starts.js
+++ b/dom/media/mediacontrol/tests/browser/browser_media_control_before_media_starts.js
@@ -184,7 +184,7 @@ function enableMediaFullScreenInIframe(tab) {
}
function waitUntilIframeMediaStartedPlaying(tab) {
- return SpecialPowers.spawn(tab.linkedBrowser, [IFRAME_URL], async url => {
+ return SpecialPowers.spawn(tab.linkedBrowser, [IFRAME_URL], async () => {
info(`check if media in iframe starts playing`);
const iframe = content.document.getElementById("iframe");
iframe.contentWindow.postMessage("check-playing", "*");
diff --git a/dom/media/mediacontrol/tests/gtest/MediaKeyListenerTest.h b/dom/media/mediacontrol/tests/gtest/MediaKeyListenerTest.h
index 5145eb7dbb..50ef254947 100644
--- a/dom/media/mediacontrol/tests/gtest/MediaKeyListenerTest.h
+++ b/dom/media/mediacontrol/tests/gtest/MediaKeyListenerTest.h
@@ -18,7 +18,7 @@ class MediaKeyListenerTest : public MediaControlKeyListener {
void Clear() { mReceivedKey = mozilla::Nothing(); }
void OnActionPerformed(const MediaControlAction& aAction) override {
- mReceivedKey = mozilla::Some(aAction.mKey);
+ mReceivedKey = aAction.mKey;
}
bool IsResultEqualTo(MediaControlKey aResult) const {
if (mReceivedKey) {
diff --git a/dom/media/mediacontrol/tests/gtest/moz.build b/dom/media/mediacontrol/tests/gtest/moz.build
index 7043bfcd5e..a8602f6718 100644
--- a/dom/media/mediacontrol/tests/gtest/moz.build
+++ b/dom/media/mediacontrol/tests/gtest/moz.build
@@ -11,7 +11,7 @@ UNIFIED_SOURCES += [
"TestMediaKeysEvent.cpp",
]
-if CONFIG["MOZ_APPLEMEDIA"]:
+if CONFIG["MOZ_APPLEMEDIA"] and CONFIG["TARGET_OS"] == "OSX":
UNIFIED_SOURCES += ["TestMediaKeysEventMac.mm", "TestMediaKeysEventMediaCenter.mm"]
include("/ipc/chromium/chromium-config.mozbuild")