Merge branch 'backlog_4903-all-upstreamBrowser' into 'master'

Upstream Browser and BrowserWebView to Bromite v98.0.4758.108

See merge request e/apps/browser!42

bromite @ 35e91703

-Subproject commit 0b2a41b2af91b8e237e761a5690dd6734674b7a8
+Subproject commit 35e91703127cc39bf917bc5b51bc947be4729561

build.sh

@@ -67,7 +67,7 @@ function patch() {
 function build() {
     local out="out/${BUILDID}_${ARCH}"
     echo ">> [$(date)] Build for ${ARCH}"
-    gn gen --args="$(cat "${ROOT_DIR}"/bromite/build/GN_ARGS) target_cpu=\"${ARCH}\" " "$out"
+    gn gen --args="$(cat "${ROOT_DIR}"/bromite/build/bromite.gn_args) target_cpu=\"${ARCH}\" " "$out"
     autoninja -C "$out" chrome_public_apk system_webview_apk
     cp "$out/apks/ChromePublic.apk" "${ROOT_DIR}/apks/ChromePublic_$ARCH.apk"
     cp "$out/apks/SystemWebView.apk" "${ROOT_DIR}/apks/SystemWebView_$ARCH.apk"

build/e_patches_list.txt

 0001-Browser-Change-app-and-package-name-to-browser.patch
-0001-Browser-Use-our-custom-icon-instead-of-chromium.patch
-0001-Browser-Rename-strings-to-browser.patch
-0001-Browser-Point-to-our-default-popular-sites.patch
-0001-Browser-Enable-do-not-track-by-default.patch
-0001-Browser-Add-provider-to-share-default-search-engine.patch
-0001-Browser-Disable-async-DNS-by-default-on-Android.patch
-0001-Browser-Enable-custom-tabs-by-default.patch
-0001-Browser-Enable-search-suggestion-by-default.patch
-0001-Browser-Hide-and-disable-touch-to-search-option.patch
-0001-Browser-Modify-default-search-engines.patch
-0001-Browser-Redirect-users-to-e-foundation-docs.patch
-0001-Revert-Bromite-auto-updater.patch
-0001-Revert-Block-gateway-attacks-via-websockets.patch
-0001-Revert-Disable-unified-autoplay-feature.patch
+0002-Browser-Use-our-custom-icon-instead-of-chromium.patch
+0003-Browser-Rename-strings-to-browser.patch
+0004-Browser-Point-to-our-default-popular-sites.patch
+0005-Browser-Enable-do-not-track-by-default.patch
+0006-Browser-Add-provider-to-share-default-search-engine.patch
+0007-Browser-Disable-async-DNS-by-default-on-Android.patch
+0008-Browser-Enable-custom-tabs-by-default.patch
+0009-Browser-Enable-search-suggestion-by-default.patch
+0010-Browser-Hide-and-disable-touch-to-search-option.patch
+0011-Browser-Modify-default-search-engines.patch
+0012-Browser-Redirect-users-to-e-foundation-docs.patch
+0013-Revert-Bromite-auto-updater.patch
+0014-Revert-Block-gateway-attacks-via-websockets.patch
+0015-Revert-Disable-unified-autoplay-feature.patch

build/patches/0001-Browser-Change-app-and-package-name-to-browser.patch

-From 009e3ecb9fae3ff95cf8b9f02ca045093a2526fc Mon Sep 17 00:00:00 2001
+From 66fb1b82194577018afe73475fd5dac22e4d5b6a Mon Sep 17 00:00:00 2001
 From: Aayush Gupta <theimpulson@e.email>
 Date: Fri, 26 Nov 2021 05:39:25 +0000
-Subject: [PATCH] Browser: Change app and package name to browser
+Subject: [PATCH 01/15] Browser: Change app and package name to browser
 
 Signed-off-by: Aayush Gupta <theimpulson@e.email>
 ---
@@ -10,7 +10,7 @@ Signed-off-by: Aayush Gupta <theimpulson@e.email>
  2 files changed, 7 insertions(+), 16 deletions(-)
 
 diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
-index 710985b89777b..211eeded4a74e 100644
+index 465896c955bf0..da21f309f2e78 100644
 --- a/chrome/android/BUILD.gn
 +++ b/chrome/android/BUILD.gn
 @@ -43,16 +43,7 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {

build/patches/0001-Browser-Use-our-custom-icon-instead-of-chromium.patch → build/patches/0002-Browser-Use-our-custom-icon-instead-of-chromium.patch

-From 1a39cb7d6e46f9bcfebaa3e681e2716c040345ea Mon Sep 17 00:00:00 2001
+From 1e4f671db28cd21f9a97b51c569a1662a0f84956 Mon Sep 17 00:00:00 2001
 From: Aayush Gupta <theimpulson@e.email>
 Date: Fri, 26 Nov 2021 06:04:08 +0000
-Subject: [PATCH] Browser: Use our custom icon instead of chromium
+Subject: [PATCH 02/15] Browser: Use our custom icon instead of chromium
 
 Signed-off-by: Aayush Gupta <theimpulson@e.email>
 ---

build/patches/0001-Browser-Rename-strings-to-browser.patch → build/patches/0003-Browser-Rename-strings-to-browser.patch

-From aae9f02fc5ef2e5d0cdfc87781a6009b73bf4c2c Mon Sep 17 00:00:00 2001
+From 2b2222b83bc5d7a1dee12620214d3c79bb7bc25f Mon Sep 17 00:00:00 2001
 From: Aayush Gupta <theimpulson@e.email>
 Date: Fri, 26 Nov 2021 07:12:30 +0000
-Subject: [PATCH] Browser: Rename strings to browser
+Subject: [PATCH 03/15] Browser: Rename strings to browser
 
 Signed-off-by: Aayush Gupta <theimpulson@e.email>
 ---
@@ -159,20 +159,20 @@ index 69f2ba955ca4e..308181c06128e 100644
          }
      }
 diff --git a/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/WebContentsDarkModeMessageController.java b/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/WebContentsDarkModeMessageController.java
-index 1091c418a12d9..6422dfbe06a2b 100644
+index bdad48714fd0a..d37700a9cf527 100644
 --- a/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/WebContentsDarkModeMessageController.java
 +++ b/chrome/browser/ui/android/night_mode/java/src/org/chromium/chrome/browser/night_mode/WebContentsDarkModeMessageController.java
-@@ -107,7 +107,7 @@ public class WebContentsDarkModeMessageController {
-                         .with(MessageBannerProperties.ICON_TINT_COLOR,
-                                 MessageBannerProperties.TINT_NONE)
-                         .with(MessageBannerProperties.TITLE,
--                                resources.getString(R.string.auto_dark_message_title))
-+                                resources.getString(R.string.auto_dark_message_title_e))
-                         .with(MessageBannerProperties.PRIMARY_BUTTON_TEXT,
-                                 resources.getString(R.string.auto_dark_message_button))
-                         .with(MessageBannerProperties.ON_PRIMARY_ACTION,
+@@ -106,7 +106,7 @@ public class WebContentsDarkModeMessageController {
+         Resources resources = activity.getResources();
+         boolean optOut = ChromeFeatureList.getFieldTrialParamByFeatureAsBoolean(
+                 ChromeFeatureList.DARKEN_WEBSITES_CHECKBOX_IN_THEMES_SETTING, OPT_OUT_PARAM, true);
+-        String messageTitle = optOut ? resources.getString(R.string.auto_dark_message_title)
++        String messageTitle = optOut ? resources.getString(R.string.auto_dark_message_title_e)
+                                      : resources.getString(R.string.auto_dark_message_opt_in_title);
+         PropertyModel message =
+                 new PropertyModel.Builder(MessageBannerProperties.ALL_KEYS)
 diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
-index 3dca6672b74a0..9408db809dd0e 100644
+index 465e988c4b538..2bb1965e7faad 100644
 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
 +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
 @@ -198,6 +198,8 @@ CHAR_LIMIT guidelines:

build/patches/0001-Browser-Point-to-our-default-popular-sites.patch → build/patches/0004-Browser-Point-to-our-default-popular-sites.patch

-From dc58e5dfcc72d2ea3874d589cb6936bcf1e69ac1 Mon Sep 17 00:00:00 2001
+From 652fee781e167e3f31866b4aa5461da890f7c06c Mon Sep 17 00:00:00 2001
 From: Aayush Gupta <theimpulson@e.email>
 Date: Fri, 26 Nov 2021 07:29:59 +0000
-Subject: [PATCH] Browser: Point to our default popular sites
+Subject: [PATCH 04/15] Browser: Point to our default popular sites
 
 Signed-off-by: Aayush Gupta <theimpulson@e.email>
 ---

build/patches/0001-Browser-Enable-do-not-track-by-default.patch → build/patches/0005-Browser-Enable-do-not-track-by-default.patch

-From 5a9b5acefb9cab0f42466624a90f14743567f02a Mon Sep 17 00:00:00 2001
+From d3807831da08fd4b8b57b42ad15137e67507c4c4 Mon Sep 17 00:00:00 2001
 From: Aayush Gupta <theimpulson@e.email>
 Date: Fri, 26 Nov 2021 07:34:57 +0000
-Subject: [PATCH] Browser: Enable do not track by default
+Subject: [PATCH 05/15] Browser: Enable do not track by default
 
 Signed-off-by: Aayush Gupta <theimpulson@e.email>
 ---
@@ -9,10 +9,10 @@ Signed-off-by: Aayush Gupta <theimpulson@e.email>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
-index 20bb8b5bd368b..c529edeea5f35 100644
+index 5a0ab16f3bd41..e182299bbc871 100644
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -86,7 +86,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
+@@ -88,7 +88,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterDictionaryPref(prefs::kBrowserWindowPlacementPopup);
    registry->RegisterDictionaryPref(prefs::kAppWindowPlacement);
    registry->RegisterBooleanPref(

build/patches/0001-Browser-Add-provider-to-share-default-search-engine.patch → build/patches/0006-Browser-Add-provider-to-share-default-search-engine.patch

-From 013fbab37c4c5288cf0163bb3f88de0a58e06211 Mon Sep 17 00:00:00 2001
+From 4d2a1341f13ec9d599673a4b76521e49d3adf5b8 Mon Sep 17 00:00:00 2001
 From: Aayush Gupta <theimpulson@e.email>
 Date: Fri, 26 Nov 2021 08:03:13 +0000
-Subject: [PATCH] Browser: Add provider to share default search engine
+Subject: [PATCH 06/15] Browser: Add provider to share default search engine
 
 Signed-off-by: Aayush Gupta <theimpulson@e.email>
 ---
@@ -12,10 +12,10 @@ Signed-off-by: Aayush Gupta <theimpulson@e.email>
  create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/provider/SearchEngineProvider.java
 
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
-index e2cf845e088ff..fdea2d7c83b21 100644
+index 0f7d00b646f24..3345822fc5528 100644
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
-@@ -1276,6 +1276,12 @@ by a child template that "extends" this file.
+@@ -1264,6 +1264,12 @@ by a child template that "extends" this file.
                    android:readPermission="android.permission.GLOBAL_SEARCH" />
        </provider>
  

build/patches/0001-Browser-Disable-async-DNS-by-default-on-Android.patch → build/patches/0007-Browser-Disable-async-DNS-by-default-on-Android.patch

-From 26005fd02b8c03fc6ddd6c450ab766a522e6b53b Mon Sep 17 00:00:00 2001
+From 5354ab198a304d8808ade53e594b54aa8571b902 Mon Sep 17 00:00:00 2001
 From: Aayush Gupta <theimpulson@e.email>
 Date: Fri, 26 Nov 2021 08:26:03 +0000
-Subject: [PATCH] Browser: Disable async DNS by default on Android
+Subject: [PATCH 07/15] Browser: Disable async DNS by default on Android
 
 Signed-off-by: Aayush Gupta <theimpulson@e.email>
 ---
@@ -9,10 +9,10 @@ Signed-off-by: Aayush Gupta <theimpulson@e.email>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
-index aac450f4fee76..49f2559598d00 100644
+index 2e4055d0a2ac3..68c2fd6b25348 100644
 --- a/chrome/common/chrome_features.cc
 +++ b/chrome/common/chrome_features.cc
-@@ -80,7 +80,7 @@ const base::Feature kAppShimNewCloseBehavior{"AppShimNewCloseBehavior",
+@@ -102,7 +102,7 @@ const base::Feature kArcPiGhostWindow{"ArcPiGhostWindow",
  // Enables the built-in DNS resolver.
  const base::Feature kAsyncDns {
    "AsyncDns",

build/patches/0001-Browser-Enable-custom-tabs-by-default.patch → build/patches/0008-Browser-Enable-custom-tabs-by-default.patch

-From 2e1722f561cd6c96af515feb8ff9486990981496 Mon Sep 17 00:00:00 2001
+From 640e5044eddae6bac3b3b4c39be8d04af9b8017d Mon Sep 17 00:00:00 2001
 From: Aayush Gupta <aayushgupta219@gmail.com>
 Date: Mon, 29 Nov 2021 03:37:37 +0000
-Subject: [PATCH] Browser: Enable custom tabs by default
+Subject: [PATCH 08/15] Browser: Enable custom tabs by default
 
 Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
 ---
@@ -9,10 +9,10 @@ Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
-index f6f21411b6a69..a0e31a8f34380 100644
+index 7ecd27f213a60..1dbf8ac3662f5 100644
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
-@@ -64,7 +64,7 @@
+@@ -69,7 +69,7 @@
          android:key="allow_custom_tab_intents"
          android:title="@string/allow_custom_tab_intents_title"
          android:summary="@string/allow_custom_tab_intents_summary"

build/patches/0001-Browser-Enable-search-suggestion-by-default.patch → build/patches/0009-Browser-Enable-search-suggestion-by-default.patch

-From b576939773355b9d851b0f0e9cdcfc14cdef961a Mon Sep 17 00:00:00 2001
+From 7d046c35475890e9571b91f2b80bf4ca606b30db Mon Sep 17 00:00:00 2001
 From: Aayush Gupta <aayushgupta219@gmail.com>
 Date: Mon, 29 Nov 2021 03:39:21 +0000
-Subject: [PATCH] Browser: Enable search suggestion by default
+Subject: [PATCH 09/15] Browser: Enable search suggestion by default
 
 Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
 ---
@@ -9,10 +9,10 @@ Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
-index c8a3976280250..f50da2ceba636 100644
+index 43ae6997d3616..0dc159f23aff9 100644
 --- a/chrome/browser/profiles/profile.cc
 +++ b/chrome/browser/profiles/profile.cc
-@@ -281,7 +281,7 @@ const char Profile::kProfileKey[] = "__PROFILE__";
+@@ -277,7 +277,7 @@ const char Profile::kProfileKey[] = "__PROFILE__";
  void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
    registry->RegisterBooleanPref(
        prefs::kSearchSuggestEnabled,

build/patches/0001-Browser-Hide-and-disable-touch-to-search-option.patch → build/patches/0010-Browser-Hide-and-disable-touch-to-search-option.patch

-From 53a12891438279dd934039596fdc4c6e43632f17 Mon Sep 17 00:00:00 2001
+From d6d54702aa37d9527984ba4c1dc5973230dc1be0 Mon Sep 17 00:00:00 2001
 From: Aayush Gupta <aayushgupta219@gmail.com>
 Date: Mon, 29 Nov 2021 03:54:44 +0000
-Subject: [PATCH] Browser: Hide and disable touch to search option
+Subject: [PATCH 10/15] Browser: Hide and disable touch to search option
 
 Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
 ---
@@ -10,7 +10,7 @@ Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
  2 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
-index 881077bbeb57c..6c0775a58c758 100644
+index 1dbf8ac3662f5..e1d80fcf744f0 100644
 --- a/chrome/android/java/res/xml/privacy_preferences.xml
 +++ b/chrome/android/java/res/xml/privacy_preferences.xml
 @@ -92,7 +92,8 @@

build/patches/0001-Browser-Modify-default-search-engines.patch → build/patches/0011-Browser-Modify-default-search-engines.patch

-From 96365c6465a37907a0739c9f4dc93d815ef6fdcd Mon Sep 17 00:00:00 2001
+From 4b1579888cc0e39a06645bbc03020531e1cb5b2e Mon Sep 17 00:00:00 2001
 From: Aayush Gupta <theimpulson@e.email>
 Date: Thu, 18 Mar 2021 13:42:44 +0100
-Subject: [PATCH] Browser: Modify default search engines
+Subject: [PATCH 11/15] Browser: Modify default search engines
 
 Signed-off-by: Aayush Gupta <theimpulson@e.email>
 ---
@@ -12,8 +12,8 @@ Signed-off-by: Aayush Gupta <theimpulson@e.email>
  .../search_engines/prepopulated_engines.json  |  10 +
  .../search_engines/search_engine_type.h       |   1 +
  .../search_engines/search_engine_utils.cc     |  12 +-
- .../template_url_prepopulate_data.cc          | 645 +++---------------
- 8 files changed, 123 insertions(+), 591 deletions(-)
+ .../template_url_prepopulate_data.cc          | 648 +++---------------
+ 8 files changed, 123 insertions(+), 594 deletions(-)
 
 diff --git a/chrome/browser/android/locale/locale_template_url_loader.cc b/chrome/browser/android/locale/locale_template_url_loader.cc
 index a9d8db3b69bd6..16298c4833ee2 100644
@@ -82,7 +82,7 @@ index a9d8db3b69bd6..16298c4833ee2 100644
  
  LocaleTemplateUrlLoader::~LocaleTemplateUrlLoader() {}
 diff --git a/chrome/browser/android/locale/locale_template_url_loader.h b/chrome/browser/android/locale/locale_template_url_loader.h
-index 20290e0e05bdb..abcc3986df715 100644
+index f0ee14d25c73a..9aa4ca1056519 100644
 --- a/chrome/browser/android/locale/locale_template_url_loader.h
 +++ b/chrome/browser/android/locale/locale_template_url_loader.h
 @@ -21,7 +21,6 @@ class LocaleTemplateUrlLoader {
@@ -132,7 +132,7 @@ index 85e8503b342da..5e40569d225fa 100644
      }
  }
 diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json
-index 1c54923b0247e..df11b4d2eb34f 100644
+index 41bf128866344..9c951f52ecb25 100644
 --- a/components/search_engines/prepopulated_engines.json
 +++ b/components/search_engines/prepopulated_engines.json
 @@ -112,6 +112,16 @@
@@ -153,13 +153,13 @@ index 1c54923b0247e..df11b4d2eb34f 100644
        "name": "Ecosia",
        "keyword": "ecosia.org",
 diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h
-index a0500e883f177..244b272ffe1a4 100644
+index bb1d3a7513007..3ce5c2e818656 100644
 --- a/components/search_engines/search_engine_type.h
 +++ b/components/search_engines/search_engine_type.h
-@@ -76,6 +76,7 @@ enum SearchEngineType {
-   SEARCH_ENGINE_PRIVACYWALL = 58,
-   SEARCH_ENGINE_ECOSIA = 59,
-   SEARCH_ENGINE_GOOGLE_EN,
+@@ -77,6 +77,7 @@ enum SearchEngineType {
+   SEARCH_ENGINE_PETALSEARCH = 60,
+   SEARCH_ENGINE_GOOGLE_EN = 61,
+   SEARCH_ENGINE_DUCKDUCKGOLIGHT = 62,
 +  SEARCH_ENGINE_ESPOT,
  
    SEARCH_ENGINE_MAX  // Bounding value needed for UMA histogram macro.
@@ -188,10 +188,10 @@ index ecbd15614ef0a..20b6bc09e1029 100644
      // First check the main search URL.
      if (SameDomain(
 diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc
-index 6488b66b6b4b9..eede4215c42cc 100644
+index cec97482174c0..cd4139699416f 100644
 --- a/components/search_engines/template_url_prepopulate_data.cc
 +++ b/components/search_engines/template_url_prepopulate_data.cc
-@@ -29,971 +29,544 @@ namespace {
+@@ -29,9 +29,7 @@ namespace {
  
  // Default (for countries with no better engine set)
  const PrepopulatedEngine* const engines_default[] = {
@@ -202,7 +202,8 @@ index 6488b66b6b4b9..eede4215c42cc 100644
  };
  
  // Note, the below entries are sorted by country code, not the name in comment.
- // Engine selection by country ------------------------------------------------
+@@ -39,965 +37,537 @@ const PrepopulatedEngine* const engines_default[] = {
+ // clang-format off
  // United Arab Emirates
  const PrepopulatedEngine* const engines_AE[] = {
 -    &googleen, &google,
@@ -259,6 +260,7 @@ index 6488b66b6b4b9..eede4215c42cc 100644
 -    &bing,
 -    &yahoo,
 -    &duckduckgo, &duckduckgo_light,
+-    &yandex_com,
 +    &espot, &qwant, &duckduckgo, &duckduckgo_light,
  };
  
@@ -288,7 +290,7 @@ index 6488b66b6b4b9..eede4215c42cc 100644
 -    &bing,
 -    &yahoo,
 -    &duckduckgo, &duckduckgo_light,
--    &ecosia,
+-    &yandex_com,
 +    &espot, &qwant, &duckduckgo, &duckduckgo_light,
  };
  
@@ -348,7 +350,7 @@ index 6488b66b6b4b9..eede4215c42cc 100644
 -    &bing,
 -    &yahoo,
 -    &duckduckgo, &duckduckgo_light,
--    &ask,
+-    &ecosia,
 +    &espot, &qwant, &duckduckgo, &duckduckgo_light,
  };
  
@@ -376,7 +378,7 @@ index 6488b66b6b4b9..eede4215c42cc 100644
  const PrepopulatedEngine* const engines_CL[] = {
 -    &googleen, &google,
 -    &bing,
--    &yahoo_es,
+-    &yahoo_cl,
 -    &duckduckgo, &duckduckgo_light,
 -    &ecosia,
 +    &espot, &qwant, &duckduckgo, &duckduckgo_light,
@@ -384,10 +386,10 @@ index 6488b66b6b4b9..eede4215c42cc 100644
  
  // China
  const PrepopulatedEngine* const engines_CN[] = {
--    &baidu,
 -    &sogou,
--    &googleen, &google,
+-    &baidu,
 -    &bing,
+-    &googleen, &google,
 -    &so_360,
 +    &espot, &qwant, &duckduckgo, &duckduckgo_light,
  };
@@ -396,7 +398,7 @@ index 6488b66b6b4b9..eede4215c42cc 100644
  const PrepopulatedEngine* const engines_CO[] = {
 -    &googleen, &google,
 -    &bing,
--    &yahoo_es,
+-    &yahoo_co,
 -    &ecosia,
 -    &duckduckgo, &duckduckgo_light,
 +    &espot, &qwant, &duckduckgo, &duckduckgo_light,
@@ -426,8 +428,8 @@ index 6488b66b6b4b9..eede4215c42cc 100644
  const PrepopulatedEngine* const engines_DE[] = {
 -    &googleen, &google,
 -    &bing,
--    &duckduckgo, &duckduckgo_light,
 -    &ecosia,
+-    &duckduckgo, &duckduckgo_light,
 -    &yahoo_de,
 +    &espot, &qwant, &duckduckgo, &duckduckgo_light,
  };
@@ -455,9 +457,9 @@ index 6488b66b6b4b9..eede4215c42cc 100644
  // Algeria
  const PrepopulatedEngine* const engines_DZ[] = {
 -    &googleen, &google,
--    &yahoo_uk,
 -    &bing,
--    &yandex_ru,
+-    &yahoo_fr,
+-    &yandex_com,
 -    &duckduckgo, &duckduckgo_light,
 +    &espot, &qwant, &duckduckgo, &duckduckgo_light,
  };
@@ -467,8 +469,8 @@ index 6488b66b6b4b9..eede4215c42cc 100644
 -    &googleen, &google,
 -    &bing,
 -    &yahoo,
--    &duckduckgo, &duckduckgo_light,
 -    &ecosia,
+-    &duckduckgo, &duckduckgo_light,
 +    &espot, &qwant, &duckduckgo, &duckduckgo_light,
  };
  
@@ -477,16 +479,16 @@ index 6488b66b6b4b9..eede4215c42cc 100644
 -    &googleen, &google,
 -    &bing,
 -    &yandex_ru,
+-    &duckduckgo, &duckduckgo_light,
 -    &yahoo,
--    &mail_ru,
 +    &espot, &qwant, &duckduckgo, &duckduckgo_light,
  };
  
  // Egypt
  const PrepopulatedEngine* const engines_EG[] = {
 -    &googleen, &google,
--    &yahoo,
 -    &bing,
+-    &yahoo,
 -    &yandex_com,
 -    &duckduckgo, &duckduckgo_light,
 +    &espot, &qwant, &duckduckgo, &duckduckgo_light,
@@ -548,7 +550,7 @@ index 6488b66b6b4b9..eede4215c42cc 100644
 -    &bing,
 -    &yahoo,
 -    &duckduckgo, &duckduckgo_light,
--    &yandex_com,
+-    &yandex_ru,
 +    &espot, &qwant, &duckduckgo, &duckduckgo_light,
  };
  
@@ -588,7 +590,7 @@ index 6488b66b6b4b9..eede4215c42cc 100644
 -    &bing,
 -    &yahoo,
 -    &duckduckgo, &duckduckgo_light,
--    &yandex_ru,
+-    &ecosia,
 +    &espot, &qwant, &duckduckgo, &duckduckgo_light,
  };
  
@@ -598,7 +600,7 @@ index 6488b66b6b4b9..eede4215c42cc 100644
 -    &bing,
 -    &yahoo,
 -    &duckduckgo, &duckduckgo_light,
--    &ecosia,
+-    &yandex_com,
 +    &espot, &qwant, &duckduckgo, &duckduckgo_light,
  };
  
@@ -607,8 +609,8 @@ index 6488b66b6b4b9..eede4215c42cc 100644
 -    &googleen, &google,
 -    &yahoo_id,
 -    &bing,
--    &duckduckgo, &duckduckgo_light,
 -    &yandex_com,
+-    &duckduckgo, &duckduckgo_light,
 +    &espot, &qwant, &duckduckgo, &duckduckgo_light,
  };
  
@@ -616,7 +618,7 @@ index 6488b66b6b4b9..eede4215c42cc 100644
  const PrepopulatedEngine* const engines_IE[] = {
 -    &googleen, &google,
 -    &bing,
--    &yahoo,
+-    &yahoo_uk,
 -    &duckduckgo, &duckduckgo_light,
 -    &ecosia,
 +    &espot, &qwant, &duckduckgo, &duckduckgo_light,
@@ -638,7 +640,7 @@ index 6488b66b6b4b9..eede4215c42cc 100644
 -    &bing,
 -    &yahoo_in,
 -    &duckduckgo, &duckduckgo_light,
--    &ecosia,
+-    &info_com,
 +    &espot, &qwant, &duckduckgo, &duckduckgo_light,
  };
  
@@ -646,8 +648,8 @@ index 6488b66b6b4b9..eede4215c42cc 100644
  const PrepopulatedEngine* const engines_IQ[] = {
 -    &googleen, &google,
 -    &bing,
--    &yahoo_uk,
--    &yandex_com,
+-    &yahoo,
+-    &yandex_tr,
 -    &duckduckgo, &duckduckgo_light,
 +    &espot, &qwant, &duckduckgo, &duckduckgo_light,
  };
@@ -658,7 +660,7 @@ index 6488b66b6b4b9..eede4215c42cc 100644
 -    &bing,
 -    &yahoo,
 -    &ask,
--    &naver,
+-    &duckduckgo, &duckduckgo_light,
 +    &espot, &qwant, &duckduckgo, &duckduckgo_light,
  };
  
@@ -666,8 +668,8 @@ index 6488b66b6b4b9..eede4215c42cc 100644
  const PrepopulatedEngine* const engines_IS[] = {
 -    &googleen, &google,
 -    &bing,
--    &yahoo,
 -    &duckduckgo, &duckduckgo_light,
+-    &yahoo,
 -    &ecosia,
 +    &espot, &qwant, &duckduckgo, &duckduckgo_light,
  };
@@ -707,8 +709,8 @@ index 6488b66b6b4b9..eede4215c42cc 100644
 -    &googleen, &google,
 -    &yahoo_jp,
 -    &bing,
--    &baidu,
 -    &duckduckgo, &duckduckgo_light,
+-    &baidu,
 +    &espot, &qwant, &duckduckgo, &duckduckgo_light,
  };
  
@@ -726,8 +728,8 @@ index 6488b66b6b4b9..eede4215c42cc 100644
  const PrepopulatedEngine* const engines_KR[] = {
 -    &googleen, &google,
 -    &naver,
--    &bing,
 -    &daum,
+-    &bing,
 -    &yahoo,
 +    &espot, &qwant, &duckduckgo, &duckduckgo_light,
  };
@@ -748,7 +750,7 @@ index 6488b66b6b4b9..eede4215c42cc 100644
 -    &yandex_kz,
 -    &mail_ru,
 -    &bing,
--    &yahoo,
+-    &duckduckgo, &duckduckgo_light,
 +    &espot, &qwant, &duckduckgo, &duckduckgo_light,
  };
  
@@ -758,7 +760,7 @@ index 6488b66b6b4b9..eede4215c42cc 100644
 -    &bing,
 -    &yahoo,
 -    &duckduckgo, &duckduckgo_light,
--    &yandex_ru,
+-    &ecosia,
 +    &espot, &qwant, &duckduckgo, &duckduckgo_light,
  };
  
@@ -777,8 +779,8 @@ index 6488b66b6b4b9..eede4215c42cc 100644
 -    &googleen, &google,
 -    &bing,
 -    &yahoo,
--    &yandex_ru,
 -    &duckduckgo, &duckduckgo_light,
+-    &yandex_ru,
 +    &espot, &qwant, &duckduckgo, &duckduckgo_light,
  };
  
@@ -815,8 +817,8 @@ index 6488b66b6b4b9..eede4215c42cc 100644
  // Morocco
  const PrepopulatedEngine* const engines_MA[] = {
 -    &googleen, &google,
--    &yahoo_fr,
 -    &bing,
+-    &yahoo_fr,
 -    &yandex_com,
 -    &duckduckgo, &duckduckgo_light,
 +    &espot, &qwant, &duckduckgo, &duckduckgo_light,
@@ -826,9 +828,9 @@ index 6488b66b6b4b9..eede4215c42cc 100644
  const PrepopulatedEngine* const engines_MC[] = {
 -    &googleen, &google,
 -    &bing,
--    &yahoo,
 -    &duckduckgo, &duckduckgo_light,
--    &qwant,
+-    &yahoo_fr,
+-    &ecosia,
 +    &espot, &qwant, &duckduckgo, &duckduckgo_light,
  };
  
@@ -836,8 +838,8 @@ index 6488b66b6b4b9..eede4215c42cc 100644
  const PrepopulatedEngine* const engines_MD[] = {
 -    &googleen, &google,
 -    &yandex_ru,
--    &mail_ru,
 -    &bing,
+-    &mail_ru,
 -    &yahoo,
 +    &espot, &qwant, &duckduckgo, &duckduckgo_light,
  };
@@ -858,7 +860,7 @@ index 6488b66b6b4b9..eede4215c42cc 100644
 -    &bing,
 -    &yahoo,
 -    &duckduckgo, &duckduckgo_light,
--    &baidu,
+-    &yandex_ru,
 +    &espot, &qwant, &duckduckgo, &duckduckgo_light,
  };
  
@@ -878,7 +880,7 @@ index 6488b66b6b4b9..eede4215c42cc 100644
 -    &bing,
 -    &yahoo_my,
 -    &duckduckgo, &duckduckgo_light,
--    &baidu,
+-    &ecosia,
 +    &espot, &qwant, &duckduckgo, &duckduckgo_light,
  };
  
@@ -896,8 +898,8 @@ index 6488b66b6b4b9..eede4215c42cc 100644
  const PrepopulatedEngine* const engines_NL[] = {
 -    &googleen, &google,