From acd2429577ee0c294ea3d23de0ebe8f3e78f61d6 Mon Sep 17 00:00:00 2001
From: Marco Castelluccio <mcastelluccio@mozilla.com>
Date: Thu, 1 Feb 2024 00:43:40 +0000
Subject: [PATCH] Bug 1875085 - [marionette] Fallback to type hint "tab" in
 "WebDriver:NewWindow` on Android when "window" is specified.
 r=webdriver-reviewers,jdescottes

Differential Revision: https://phabricator.services.mozilla.com/D199130

UltraBlame original commit: b5977bb53a4c2fee750e48ea98711affc22b0ac4
---
 remote/marionette/driver.sys.mjs              | 28 +++++++++++++++++++
 .../classic/new_window/new_window.py.ini      | 17 -----------
 2 files changed, 28 insertions(+), 17 deletions(-)
 delete mode 100644 testing/web-platform/meta/webdriver/tests/classic/new_window/new_window.py.ini

diff --git a/remote/marionette/driver.sys.mjs b/remote/marionette/driver.sys.mjs
index 13b9126099ab7..8d0db628cc0bf 100644
--- a/remote/marionette/driver.sys.mjs
+++ b/remote/marionette/driver.sys.mjs
@@ -15616,6 +15616,27 @@ to
 a
 tab
 .
+/
+/
+On
+Android
+always
+use
+a
+new
+tab
+instead
+because
+the
+application
+has
+a
+/
+/
+single
+window
+only
+.
 if
 (
 typeof
@@ -15641,6 +15662,13 @@ includes
 (
 type
 )
+|
+|
+lazy
+.
+AppInfo
+.
+isAndroid
 )
 {
 type
diff --git a/testing/web-platform/meta/webdriver/tests/classic/new_window/new_window.py.ini b/testing/web-platform/meta/webdriver/tests/classic/new_window/new_window.py.ini
deleted file mode 100644
index e2edd78561a94..0000000000000
--- a/testing/web-platform/meta/webdriver/tests/classic/new_window/new_window.py.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-new_window
-.
-py
-]
-disabled
-:
-if
-os
-=
-=
-"
-android
-"
-:
-Not
-supported