From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:35:49 +0200 Subject: Merging upstream version 126.0. Signed-off-by: Daniel Baumann --- .../assets/web_extensions/langpack_signed.xpi | Bin 4452 -> 7593 bytes .../web_extensions/options_page_alias/manifest.json | 12 ++++++++++++ .../src/androidTest/assets/www/badVideoPath.html | 2 +- .../geckoview/src/androidTest/assets/www/ogg.html | 11 ----------- .../src/androidTest/assets/www/videos/video.ogg | Bin 285310 -> 0 bytes 5 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 mobile/android/geckoview/src/androidTest/assets/web_extensions/options_page_alias/manifest.json delete mode 100644 mobile/android/geckoview/src/androidTest/assets/www/ogg.html delete mode 100644 mobile/android/geckoview/src/androidTest/assets/www/videos/video.ogg (limited to 'mobile/android/geckoview/src/androidTest/assets') diff --git a/mobile/android/geckoview/src/androidTest/assets/web_extensions/langpack_signed.xpi b/mobile/android/geckoview/src/androidTest/assets/web_extensions/langpack_signed.xpi index f60d00348e..ab7db3926e 100644 Binary files a/mobile/android/geckoview/src/androidTest/assets/web_extensions/langpack_signed.xpi and b/mobile/android/geckoview/src/androidTest/assets/web_extensions/langpack_signed.xpi differ diff --git a/mobile/android/geckoview/src/androidTest/assets/web_extensions/options_page_alias/manifest.json b/mobile/android/geckoview/src/androidTest/assets/web_extensions/options_page_alias/manifest.json new file mode 100644 index 0000000000..3e7b0c1f4c --- /dev/null +++ b/mobile/android/geckoview/src/androidTest/assets/web_extensions/options_page_alias/manifest.json @@ -0,0 +1,12 @@ +{ + "manifest_version": 2, + "name": "options_page_alias", + "version": "1.0", + "description": "A test add-on using options_page instead of options_ui.page", + "browser_specific_settings": { + "gecko": { + "id": "options_page_alias@tests.mozilla.org" + } + }, + "options_page": "dummy.html" +} diff --git a/mobile/android/geckoview/src/androidTest/assets/www/badVideoPath.html b/mobile/android/geckoview/src/androidTest/assets/www/badVideoPath.html index d9b34843fd..2b3300ba5c 100644 --- a/mobile/android/geckoview/src/androidTest/assets/www/badVideoPath.html +++ b/mobile/android/geckoview/src/androidTest/assets/www/badVideoPath.html @@ -5,7 +5,7 @@ diff --git a/mobile/android/geckoview/src/androidTest/assets/www/ogg.html b/mobile/android/geckoview/src/androidTest/assets/www/ogg.html deleted file mode 100644 index dd478d3b3f..0000000000 --- a/mobile/android/geckoview/src/androidTest/assets/www/ogg.html +++ /dev/null @@ -1,11 +0,0 @@ - - - - OGG Video - - - - - diff --git a/mobile/android/geckoview/src/androidTest/assets/www/videos/video.ogg b/mobile/android/geckoview/src/androidTest/assets/www/videos/video.ogg deleted file mode 100644 index ac7ece3519..0000000000 Binary files a/mobile/android/geckoview/src/androidTest/assets/www/videos/video.ogg and /dev/null differ -- cgit v1.2.3