From 8dd16259287f58f9273002717ec4d27e97127719 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 07:43:14 +0200 Subject: Merging upstream version 127.0. Signed-off-by: Daniel Baumann --- testing/web-platform/tests/tools/wpt/browser.py | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'testing/web-platform/tests/tools/wpt/browser.py') diff --git a/testing/web-platform/tests/tools/wpt/browser.py b/testing/web-platform/tests/tools/wpt/browser.py index ea71499ec4..4c42ffa4e8 100644 --- a/testing/web-platform/tests/tools/wpt/browser.py +++ b/testing/web-platform/tests/tools/wpt/browser.py @@ -1452,7 +1452,7 @@ class ChromeAndroidBase(Browser): if browser_binary is None: browser_binary = self.find_binary(channel) chrome = Chrome(self.logger) - return chrome.install_webdriver_by_version(self.version(browser_binary), dest) + return chrome.install_webdriver_by_version(self.version(browser_binary), dest, channel) def version(self, binary=None, webdriver_binary=None): if not binary: @@ -1489,20 +1489,6 @@ class ChromeAndroid(ChromeAndroidBase): return "com.android.chrome" -# TODO(aluo): This is largely copied from the AndroidWebView implementation. -# Tests are not running for weblayer yet (crbug/1019521), this initial -# implementation will help to reproduce and debug any issues. -class AndroidWeblayer(ChromeAndroidBase): - """Weblayer-specific interface for Android.""" - - product = "android_weblayer" - # TODO(aluo): replace this with weblayer version after tests are working. - requirements = "requirements_chromium.txt" - - def find_binary(self, venv_path=None, channel=None): - return "org.chromium.weblayer.shell" - - class AndroidWebview(ChromeAndroidBase): """Webview-specific interface for Android. @@ -1656,10 +1642,10 @@ class Opera(Browser): return m.group(0) -class EdgeChromium(Browser): +class Edge(Browser): """Microsoft Edge Chromium Browser class.""" - product = "edgechromium" + product = "edge" requirements = "requirements_chromium.txt" platform = { "Linux": "linux", -- cgit v1.2.3