Commit 81a83e6a authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Browser: Bump to version 98.0.4758.108


Signed-off-by: Aayush Gupta's avatarAayush Gupta <theimpulson@e.email>
parent cb220e9b
Pipeline #165182 passed with stages
in 440 minutes and 6 seconds
bromite @ 35e91703
Subproject commit 1243c3a8a34ed8e641c9de8356680fba672927a4
Subproject commit 35e91703127cc39bf917bc5b51bc947be4729561
From 0483002eca7497584d9cbf288e71c00585db1a18 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 01/15] Browser: Change app and package name to browser
......@@ -10,10 +10,10 @@ 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 907198952831d..fd62c42f31081 100644
index 465896c955bf0..da21f309f2e78 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -44,16 +44,7 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {
@@ -43,16 +43,7 @@ if (android_64bit_target_cpu && skip_secondary_abi_for_cq) {
assert(current_toolchain != android_secondary_abi_toolchain)
}
......@@ -31,7 +31,7 @@ index 907198952831d..fd62c42f31081 100644
declare_args() {
# Android package name to use when compiling the public chrome targets
@@ -65,7 +56,7 @@ declare_args() {
@@ -64,7 +55,7 @@ declare_args() {
# for details.
chrome_public_manifest_package = _default_package
}
......
From 82c72f29370241681032cb6a0e0ff66cac39b13e 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 02/15] Browser: Use our custom icon instead of chromium
......
From e9ffa388f4a1fa94a6063fefc8d5187977e9e663 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 03/15] Browser: Rename strings to browser
......@@ -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 2a227f2611c06..2742962163a3f 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 43d9f67276f59..cf23b1613ea04 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:
......
From 0da7533b08dcdf223ddca92f9f8dc91c5848ee0c 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 04/15] Browser: Point to our default popular sites
......
From d039e8770c9d5e39b30dc9d848828ee2ed7cf0ca 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 05/15] Browser: Enable do not track by default
......
From 43e86ecef816c0c2cdd073c68fbe5efa2e3457a0 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 06/15] Browser: Add provider to share default search engine
......@@ -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 1f92223560abf..b15bdbec74b4d 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>
......
From 35fbaeb983a52194182f5fc6a22adda965fbd22d 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 07/15] Browser: Disable async DNS by default on Android
......@@ -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 14634473c3ad7..1f0dc7157902c 100644
index 2e4055d0a2ac3..68c2fd6b25348 100644
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -94,7 +94,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",
......
From 6297b37e796b9e3e80c87f028498f4fda1a3468a 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 08/15] Browser: Enable custom tabs by default
......@@ -9,7 +9,7 @@ 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 b8566845ca902..881077bbeb57c 100644
index 7ecd27f213a60..1dbf8ac3662f5 100644
--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -69,7 +69,7 @@
......
From d7a0ef04d4a470036d3452b3fcbf4667cf83da2d 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 09/15] Browser: Enable search suggestion by default
......@@ -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 1b5aa94e6201c..012c403391a14 100644
index 43ae6997d3616..0dc159f23aff9 100644
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -276,7 +276,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,
......
From 3472af43e5933df0cce5b563f32f2babf161ebb2 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 10/15] Browser: Hide and disable touch to search option
......@@ -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 @@
......
From ebe75ee3245d7c4fcf5c352e54d8fa3b6d1f912c 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 11/15] Browser: Modify default search engines
......@@ -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,
- &bing,
- &duckduckgo, &duckduckgo_light,
- &yahoo_nl,
- &duckduckgo, &duckduckgo_light,
- &ecosia,
+ &espot, &qwant, &duckduckgo, &duckduckgo_light,
};
......@@ -928,7 +930,7 @@ index 6488b66b6b4b9..eede4215c42cc 100644
- &bing,
- &yahoo,
- &duckduckgo, &duckduckgo_light,
- &ask,
- &petal_search,
+ &espot, &qwant, &duckduckgo, &duckduckgo_light,
};
......@@ -936,7 +938,7 @@ index 6488b66b6b4b9..eede4215c42cc 100644
const PrepopulatedEngine* const engines_PA[] = {
- &googleen, &google,
- &bing,
- &yahoo,
- &yahoo_es,
- &duckduckgo, &duckduckgo_light,
- &ecosia,
+ &espot, &qwant, &duckduckgo, &duckduckgo_light,
......@@ -946,7 +948,7 @@ index 6488b66b6b4b9..eede4215c42cc 100644
const PrepopulatedEngine* const engines_PE[] = {
- &googleen, &google,
- &bing,
- &yahoo_es,
- &yahoo_pe,
- &ecosia,
- &duckduckgo, &duckduckgo_light,
+ &espot, &qwant, &duckduckgo, &duckduckgo_light,
......@@ -965,8 +967,8 @@ index 6488b66b6b4b9..eede4215c42cc 100644
// Pakistan
const PrepopulatedEngine* const engines_PK[] = {
- &googleen, &google,
- &yahoo,
- &bing,
- &yahoo,
- &duckduckgo, &duckduckgo_light,
- &yandex_com,
+ &espot, &qwant, &duckduckgo, &duckduckgo_light,
......@@ -978,6 +980,7 @@ index 6488b66b6b4b9..eede4215c42cc 100644
- &bing,
- &yahoo,
- &duckduckgo, &duckduckgo_light,
- &yandex_ru,
+ &espot, &qwant, &duckduckgo, &duckduckgo_light,
};
......@@ -1005,7 +1008,7 @@ index 6488b66b6b4b9..eede4215c42cc 100644
const PrepopulatedEngine* const engines_PY[] = {
- &googleen, &google,
- &bing,
- &yahoo,
- &yahoo_es,
- &duckduckgo, &duckduckgo_light,
- &ecosia,
+ &espot, &qwant, &duckduckgo, &duckduckgo_light,
......@@ -1017,7 +1020,7 @@ index 6488b66b6b4b9..eede4215c42cc 100644
- &bing,
- &yahoo,
- &duckduckgo, &duckduckgo_light,
- &ecosia,
- &yandex_tr,
+ &espot, &qwant, &duckduckgo, &duckduckgo_light,
};
......@@ -1027,7 +1030,7 @@ index 6488b66b6b4b9..eede4215c42cc 100644
- &bing,
- &yahoo,
- &duckduckgo, &duckduckgo_light,
- &yandex_ru,
- &yandex_tr,
+ &espot, &qwant, &duckduckgo, &duckduckgo_light,
};
......@@ -1085,9 +1088,9 @@ index 6488b66b6b4b9..eede4215c42cc 100644
const PrepopulatedEngine* const engines_SG[] = {
- &googleen, &google,
- &bing,
- &yahoo,
- &baidu,
- &yahoo_sg,
- &duckduckgo, &duckduckgo_light,
- &baidu,
+ &espot, &qwant, &duckduckgo, &duckduckgo_light,
};
......@@ -1097,6 +1100,7 @@ index 6488b66b6b4b9..eede4215c42cc 100644
- &bing,
- &duckduckgo, &duckduckgo_light,
- &yahoo,
- &yandex_com,
+ &espot, &qwant, &duckduckgo, &duckduckgo_light,
};
......@@ -1104,9 +1108,9 @@ index 6488b66b6b4b9..eede4215c42cc 100644
const PrepopulatedEngine* const engines_SK[] = {