From 61b05e15dad54d9082544aa80eec17a73e18cfa9 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Fri, 17 Jan 2020 22:22:16 +0100 Subject: [PATCH 1/6] Various improvements after proofreading --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e1485c4c..429e36da 100644 --- a/README.md +++ b/README.md @@ -73,10 +73,12 @@ You can use F-Droid client to install and receive updates via [the official Brom ## Does Bromite support WebRTC? Yes, since version 69. While the desktop version of Chromium has an option to disable it (video/audio site settings), the Android version cannot. +The WebRTC functionality has always been using safe defaults to prevent leaks (disabled multiple routes and non-proxied UDP). + ## Using Bromite will favour the monopoly of the Chromium/Blink engine, why do you develop and maintain Bromite? In short, to show what a Chromium-based engine could do **for the user** if the user experience and needs were the main focus of modern browser design. -For a browser using an alternative engine see [Fennec F-Droid](https://f-droid.org/en/packages/org.mozilla.fennec_fdroid/). +For an Android browser using an alternative engine see [Fennec F-Droid](https://f-droid.org/en/packages/org.mozilla.fennec_fdroid/). # Features @@ -84,7 +86,7 @@ For a browser using an alternative engine see [Fennec F-Droid](https://f-droid.o * remove click-tracking and AMP from search results * DNS-over-HTTPS support with any valid IETF DoH endpoint * always-incognito mode -* all field triels permanently disabled +* all field trials permanently disabled * [QUIC](https://en.wikipedia.org/wiki/QUIC) disabled by default * always-visible cookies, javascript and ads site settings * removed Play integration binary blobs @@ -95,7 +97,7 @@ For a browser using an alternative engine see [Fennec F-Droid](https://f-droid.o * completely removed safe browsing and other privacy-unfriendly features * [proxy configuration page](https://github.com/bromite/bromite/wiki/ProxyConfiguration) with PAC and custom proxy lists support * [StartPage](https://startpage.com/), [DuckDuckGo](https://duckduckgo.com/) and [Qwant](https://www.qwant.com/) search engines available by default -* chrome flags to disable custom intents and clear session on exit +* flags to disable custom intents and clear session on exit * flags to toggle anti-fingerprinting mitigations for canvas, audio, client rects, webGL and sensor APIs * use fixed User-Agent to conceal real model and browser version * privacy enhancement patches from [Iridium](https://iridiumbrowser.de/), [Inox patchset](https://github.com/gcarq/inox-patchset), [Brave](https://brave.com/) and [ungoogled-chromium](https://github.com/Eloston/ungoogled-chromium) projects @@ -128,7 +130,7 @@ Bromite's privacy features, including anti-fingerprinting mitigations (which are # Releases -All built versions are available as [releases](https://github.com/bromite/bromite/releases); the [official website](https://www.bromite.org/) points to those releases and - when browsing via Android - it will automatically select the one apt for your device (or none otherwise). +All built versions are available as [releases](https://github.com/bromite/bromite/releases); the [official website](https://www.bromite.org/) points to those releases and - when browsing via Android - it will automatically highlight the one apt for your device (or none otherwise). Each tag corresponds to a Chromium Stable release tag. -- GitLab From f3c2b7746e0d8adf7c77f50022da046b0404b77d Mon Sep 17 00:00:00 2001 From: Carl <32685696+csagan5@users.noreply.github.com> Date: Sat, 18 Jan 2020 21:22:39 +0700 Subject: [PATCH 2/6] Mention enable-search-ready-omnibox flag Fixes #469 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 429e36da..28ed4d63 100644 --- a/README.md +++ b/README.md @@ -123,6 +123,7 @@ Flags which have been retired from upstream Chromium but are still available in * `#enable-horizontal-tab-switcher` * `#pull-to-refresh` +* `#enable-search-ready-omnibox` # Privacy limitations -- GitLab From dcf07a93b3cf54bf715eeb79664c6454d58192c7 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Fri, 24 Jan 2020 10:02:21 +0100 Subject: [PATCH 3/6] Explain how DRM works in Bromite --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 28ed4d63..6f79478f 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,11 @@ Bromite uses [ungoogled-chromium's python script](https://github.com/Eloston/ung Projects which follow a strict approach on this are [Iridium](https://iridiumbrowser.de/) and [Inox patchset](https://github.com/gcarq/inox-patchset). +## Does Bromite support DRM media? + +Yes, in order to play protected/encrypted media content the browser will use Android's DRM media framework to automatically negotiate access (same as Chromium). +This means for example that requests to Android license servers will be performed (`www.googleapis.com`), see https://w3c.github.io/encrypted-media/#direct-individualization + ## What is the SystemWebView? It is the core component of Android for all web page visualizations. For example when you access a new wifi network and need to activate it, that is using the SystemWebView. If you do not know what it is then you do not need to install it. -- GitLab From 2f31069fb8fafe7005db88ce01a4b3d48b9dda14 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Sun, 26 Jan 2020 18:15:04 +0100 Subject: [PATCH 4/6] Release 79.0.3945.139 --- CHANGELOG.md | 6 +++ README.md | 17 +++++--- build/bromite_patches_list.txt | 2 + .../Add-DuckDuckGo-Lite-search-engine.patch | 2 +- .../Add-English-only-search-engine.patch | 8 ++-- build/patches/Add-Qwant-search-engine.patch | 2 +- ...nfigure-maximum-connections-per-host.patch | 2 +- ...ontrol-video-playback-resume-feature.patch | 2 +- .../Add-flag-to-disable-IPv6-probes.patch | 2 +- build/patches/Add-flag-to-disable-WebGL.patch | 2 +- ...e-device-motion-and-orientation-APIs.patch | 2 +- ...ng-for-DNS-over-HTTPS-DoH-custom-URL.patch | 4 +- .../Automated-domain-substitution.patch | 26 ++++++------ .../Bromite-AdBlockUpdaterService.patch | 4 +- ...DRM-media-origin-IDs-preprovisioning.patch | 23 +++++++++++ .../Disable-smart-selection-by-default.patch | 41 +++++++++++++++++++ ...or-canvas-text-and-client-rectangles.patch | 2 +- ...ders-in-DoH-requests-to-bare-minimum.patch | 22 +++++----- ...y-Omnibox-flag-since-it-has-launched.patch | 2 +- ...o-M78-Enable-AImageReader-by-default.patch | 18 +------- ...emove-disable-pull-to-refresh-effect.patch | 2 +- build/patches/User-Agent-anonymize.patch | 2 +- 22 files changed, 128 insertions(+), 65 deletions(-) create mode 100644 build/patches/Disable-DRM-media-origin-IDs-preprovisioning.patch create mode 100644 build/patches/Disable-smart-selection-by-default.patch diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a045bb8..3c643756 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# 79.0.3945.139 +* remove patch to automatically disable video decoding acceleration on Android 10+ and arm64 +* fix referral headers bug in non-DoH requests (fixes https://github.com/bromite/bromite/issues/470) +* disable smart selection by default, enable web search in incognito mode +* disable DRM media pre-provisioning (fixes https://github.com/bromite/bromite/issues/471) + # 79.0.3945.123 * updated User-agent version * increase minimum DoH timeout to 400ms (fixes https://github.com/bromite/bromite/issues/437) diff --git a/README.md b/README.md index 6f79478f..9a938cca 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,7 @@ Projects which follow a strict approach on this are [Iridium](https://iridiumbro Yes, in order to play protected/encrypted media content the browser will use Android's DRM media framework to automatically negotiate access (same as Chromium). This means for example that requests to Android license servers will be performed (`www.googleapis.com`), see https://w3c.github.io/encrypted-media/#direct-individualization +To disable this functionality you should disable protected content playback from Site settings -> Multimedia. ## What is the SystemWebView? It is the core component of Android for all web page visualizations. For example when you access a new wifi network and need to activate it, that is using the SystemWebView. If you do not know what it is then you do not need to install it. @@ -85,21 +86,25 @@ In short, to show what a Chromium-based engine could do **for the user** if the For an Android browser using an alternative engine see [Fennec F-Droid](https://f-droid.org/en/packages/org.mozilla.fennec_fdroid/). +## Does Bromite support extensions? +No; Bromite will support extensions only if upstream (Chromium) does, or similarly another project maintains the patch and functionality. + # Features * customizable adblock filters via user-provided URL * remove click-tracking and AMP from search results * DNS-over-HTTPS support with any valid IETF DoH endpoint * always-incognito mode -* all field trials permanently disabled -* [QUIC](https://en.wikipedia.org/wiki/QUIC) disabled by default +* disable all field trials permanently +* disable [QUIC](https://en.wikipedia.org/wiki/QUIC) by default +* disable smart search by default, allow web search from incognito mode * always-visible cookies, javascript and ads site settings -* removed Play integration binary blobs -* uses CFI on all architectures except x86 +* remove Play integration binary blobs +* use [CFI](https://en.wikipedia.org/wiki/Control-flow_integrity) on all architectures except x86 * disable media router and remoting by default * disable dynamic module loading * enable site-per-process isolation for all devices with memory > 1GB -* completely removed safe browsing and other privacy-unfriendly features +* completely remove safe browsing and other privacy-unfriendly features * [proxy configuration page](https://github.com/bromite/bromite/wiki/ProxyConfiguration) with PAC and custom proxy lists support * [StartPage](https://startpage.com/), [DuckDuckGo](https://duckduckgo.com/) and [Qwant](https://www.qwant.com/) search engines available by default * flags to disable custom intents and clear session on exit @@ -115,7 +120,7 @@ For an Android browser using an alternative engine see [Fennec F-Droid](https:// * [AV1 codec support](https://github.com/bromite/bromite/wiki/AV1-support) * [dav1d](https://code.videolan.org/videolan/dav1d) decoder enabled by default * built with official speed optimizations -* increased number of autocomplete matches +* increase number of autocomplete matches * allow changing default download storage location * do not ignore save prompt for users without SD cards * disable articles and increase number of icons on new tab page diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index 312ae469..b35f0149 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -143,6 +143,8 @@ Automated-domain-substitution.patch Do-not-enable-QUIC-by-default.patch Restore-enable-horizontal-tab-switcher-flag.patch Use-a-minimum-DoH-timeout-of-400ms.patch +Disable-DRM-media-origin-IDs-preprovisioning.patch +Disable-smart-selection-by-default.patch e-set-package-name.patch e-set-icon.patch e-set-app-name.patch diff --git a/build/patches/Add-DuckDuckGo-Lite-search-engine.patch b/build/patches/Add-DuckDuckGo-Lite-search-engine.patch index 2039b5a5..c24b4adf 100644 --- a/build/patches/Add-DuckDuckGo-Lite-search-engine.patch +++ b/build/patches/Add-DuckDuckGo-Lite-search-engine.patch @@ -38,7 +38,7 @@ diff --git a/components/search_engines/search_engine_type.h b/components/search_ + SEARCH_ENGINE_DUCKDUCKGOLIGHT, SEARCH_ENGINE_PARSIJOO, SEARCH_ENGINE_QWANT, - + SEARCH_ENGINE_GIVERO, diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc --- a/components/search_engines/template_url_prepopulate_data.cc +++ b/components/search_engines/template_url_prepopulate_data.cc diff --git a/build/patches/Add-English-only-search-engine.patch b/build/patches/Add-English-only-search-engine.patch index a18858ab..93b4dd75 100644 --- a/build/patches/Add-English-only-search-engine.patch +++ b/build/patches/Add-English-only-search-engine.patch @@ -44,9 +44,9 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/se diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h --- a/components/search_engines/search_engine_type.h +++ b/components/search_engines/search_engine_type.h -@@ -68,6 +68,7 @@ enum SearchEngineType { - SEARCH_ENGINE_PARSIJOO, - SEARCH_ENGINE_QWANT, +@@ -74,6 +74,7 @@ enum SearchEngineType { + SEARCH_ENGINE_OCEANHERO, + SEARCH_ENGINE_PRIVACYWALL, + SEARCH_ENGINE_GOOGLE_EN, SEARCH_ENGINE_MAX // Bounding value needed for UMA histogram macro. @@ -253,7 +253,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon const PrepopulatedEngine* const engines_CZ[] = { - &google, + &googleen, &google, - &seznam, + &seznam_cz, &bing, &yahoo, @@ -211,7 +211,7 @@ const PrepopulatedEngine* const engines_CZ[] = { diff --git a/build/patches/Add-Qwant-search-engine.patch b/build/patches/Add-Qwant-search-engine.patch index a0db4167..2fa63b73 100644 --- a/build/patches/Add-Qwant-search-engine.patch +++ b/build/patches/Add-Qwant-search-engine.patch @@ -221,7 +221,7 @@ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/compon const PrepopulatedEngine* const engines_CZ[] = { - &googleen, &google, + &googleen, &google, &qwant, - &seznam, + &seznam_cz, &bing, &yahoo, @@ -214,7 +214,7 @@ const PrepopulatedEngine* const engines_CZ[] = { diff --git a/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch b/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch index 9708f382..f2d4029e 100644 --- a/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch +++ b/build/patches/Add-flag-to-configure-maximum-connections-per-host.patch @@ -31,7 +31,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc // Ensure that all effective connection types returned by Network Quality // Estimator (NQE) are also exposed via flags. static_assert(net::EFFECTIVE_CONNECTION_TYPE_LAST + 2 == -@@ -2596,6 +2601,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2633,6 +2638,9 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kPassiveDocumentEventListenersName, flag_descriptions::kPassiveDocumentEventListenersDescription, kOsAll, FEATURE_VALUE_TYPE(features::kPassiveDocumentEventListeners)}, diff --git a/build/patches/Add-flag-to-control-video-playback-resume-feature.patch b/build/patches/Add-flag-to-control-video-playback-resume-feature.patch index 5ed4092c..6ee05c5e 100644 --- a/build/patches/Add-flag-to-control-video-playback-resume-feature.patch +++ b/build/patches/Add-flag-to-control-video-playback-resume-feature.patch @@ -13,7 +13,7 @@ Disable it by default on Android as it is everywhere else diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -1633,6 +1633,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1670,6 +1670,10 @@ const FeatureEntry kFeatureEntries[] = { {"enable-webassembly-threads", flag_descriptions::kEnableWasmThreadsName, flag_descriptions::kEnableWasmThreadsDescription, kOsAll, FEATURE_VALUE_TYPE(features::kWebAssemblyThreads)}, diff --git a/build/patches/Add-flag-to-disable-IPv6-probes.patch b/build/patches/Add-flag-to-disable-IPv6-probes.patch index 91430e4e..6999f1d4 100644 --- a/build/patches/Add-flag-to-disable-IPv6-probes.patch +++ b/build/patches/Add-flag-to-disable-IPv6-probes.patch @@ -16,7 +16,7 @@ Subject: Add flag to disable IPv6 probes diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -3244,6 +3244,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3281,6 +3281,11 @@ const FeatureEntry kFeatureEntries[] = { kMarkHttpAsFeatureVariations, "HTTPReallyBadFinal")}, diff --git a/build/patches/Add-flag-to-disable-WebGL.patch b/build/patches/Add-flag-to-disable-WebGL.patch index 46510be3..0fe5b191 100644 --- a/build/patches/Add-flag-to-disable-WebGL.patch +++ b/build/patches/Add-flag-to-disable-WebGL.patch @@ -11,7 +11,7 @@ Subject: Add flag to disable WebGL diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -1425,6 +1425,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1462,6 +1462,9 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kAccelerated2dCanvasName, flag_descriptions::kAccelerated2dCanvasDescription, kOsAll, SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAccelerated2dCanvas)}, diff --git a/build/patches/Add-flags-to-disable-device-motion-and-orientation-APIs.patch b/build/patches/Add-flags-to-disable-device-motion-and-orientation-APIs.patch index 2e746a39..d32f7c94 100644 --- a/build/patches/Add-flags-to-disable-device-motion-and-orientation-APIs.patch +++ b/build/patches/Add-flags-to-disable-device-motion-and-orientation-APIs.patch @@ -20,7 +20,7 @@ legacy acceleration events. diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -1659,6 +1659,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1696,6 +1696,12 @@ const FeatureEntry kFeatureEntries[] = { {"enable-gpu-rasterization", flag_descriptions::kGpuRasterizationName, flag_descriptions::kGpuRasterizationDescription, kOsAll, MULTI_VALUE_TYPE(kEnableGpuRasterizationChoices)}, diff --git a/build/patches/Add-user-setting-for-DNS-over-HTTPS-DoH-custom-URL.patch b/build/patches/Add-user-setting-for-DNS-over-HTTPS-DoH-custom-URL.patch index f491f586..8ccedbd9 100644 --- a/build/patches/Add-user-setting-for-DNS-over-HTTPS-DoH-custom-URL.patch +++ b/build/patches/Add-user-setting-for-DNS-over-HTTPS-DoH-custom-URL.patch @@ -318,7 +318,7 @@ new file mode 100644 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java --- a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java -@@ -223,6 +223,26 @@ public class FeatureUtilities { +@@ -224,6 +224,26 @@ public class FeatureUtilities { FeatureUtilitiesJni.get().setCustomTabVisible(visible); } @@ -345,7 +345,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUti /** * Records whether the activity is in multi-window mode with native-side feature utilities. * @param isInMultiWindowMode Whether the activity is in Android N multi-window mode. -@@ -852,6 +872,10 @@ public class FeatureUtilities { +@@ -878,6 +898,10 @@ public class FeatureUtilities { interface Natives { void setCustomTabVisible(boolean visible); void setIsInMultiWindowMode(boolean isInMultiWindowMode); diff --git a/build/patches/Automated-domain-substitution.patch b/build/patches/Automated-domain-substitution.patch index 5d24b454..6c305df8 100644 --- a/build/patches/Automated-domain-substitution.patch +++ b/build/patches/Automated-domain-substitution.patch @@ -11072,7 +11072,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc const FeatureEntry::Choice kPassiveListenersChoices[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, -@@ -2208,7 +2208,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2245,7 +2245,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSyncSandboxDescription, kOsAll, SINGLE_VALUE_TYPE_AND_VALUE( switches::kSyncServiceURL, @@ -11081,7 +11081,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #if !defined(OS_ANDROID) {"load-media-router-component-extension", flag_descriptions::kLoadMediaRouterComponentExtensionName, -@@ -2455,7 +2455,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2492,7 +2492,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSetMarketUrlForTestingName, flag_descriptions::kSetMarketUrlForTestingDescription, kOsAndroid, SINGLE_VALUE_TYPE_AND_VALUE(switches::kMarketUrlForTesting, @@ -90489,7 +90489,7 @@ diff --git a/third_party/sqlite/amalgamation/shell/shell.c b/third_party/sqlite/ diff --git a/third_party/sqlite/amalgamation/sqlite3.c b/third_party/sqlite/amalgamation/sqlite3.c --- a/third_party/sqlite/amalgamation/sqlite3.c +++ b/third_party/sqlite/amalgamation/sqlite3.c -@@ -21549,7 +21549,7 @@ static void clearYMD_HMS_TZ(DateTime *p){ +@@ -21556,7 +21556,7 @@ static void clearYMD_HMS_TZ(DateTime *p){ ** localtime_r() available under most POSIX platforms, except that the ** order of the parameters is reversed. ** @@ -90498,7 +90498,7 @@ diff --git a/third_party/sqlite/amalgamation/sqlite3.c b/third_party/sqlite/amal ** ** If the user has not indicated to use localtime_r() or localtime_s() ** already, check for an MSVC build environment that provides -@@ -33798,7 +33798,7 @@ struct unixFileId { +@@ -33807,7 +33807,7 @@ struct unixFileId { #else /* We are told that some versions of Android contain a bug that ** sizes ino_t at only 32-bits instead of 64-bits. (See @@ -90507,7 +90507,7 @@ diff --git a/third_party/sqlite/amalgamation/sqlite3.c b/third_party/sqlite/amal ** To work around this, always allocate 64-bits for the inode number. ** On small machines that only have 32-bit inodes, this wastes 4 bytes, ** but that should not be a big deal. */ -@@ -52851,7 +52851,7 @@ static int pager_end_transaction(Pager *pPager, int hasMaster, int bCommit){ +@@ -52860,7 +52860,7 @@ static int pager_end_transaction(Pager *pPager, int hasMaster, int bCommit){ /* Make sure the new file size is written into the inode right away. ** Otherwise the journal might resurrect following a power loss and ** cause the last transaction to roll back. See @@ -90516,7 +90516,7 @@ diff --git a/third_party/sqlite/amalgamation/sqlite3.c b/third_party/sqlite/amal */ rc = sqlite3OsSync(pPager->jfd, pPager->syncFlags); } -@@ -156311,7 +156311,7 @@ SQLITE_API int sqlite3_config(int op, ...){ +@@ -156341,7 +156341,7 @@ SQLITE_API int sqlite3_config(int op, ...){ */ case SQLITE_CONFIG_LOG: { /* MSVC is picky about pulling func ptrs from va lists. @@ -90525,7 +90525,7 @@ diff --git a/third_party/sqlite/amalgamation/sqlite3.c b/third_party/sqlite/amal ** sqlite3GlobalConfig.xLog = va_arg(ap, void(*)(void*,int,const char*)); */ typedef void(*LOGFUNC_t)(void*,int,const char*); -@@ -159639,7 +159639,7 @@ SQLITE_API int sqlite3_test_control(int op, ...){ +@@ -159669,7 +159669,7 @@ SQLITE_API int sqlite3_test_control(int op, ...){ */ case SQLITE_TESTCTRL_FAULT_INSTALL: { /* MSVC is picky about pulling func ptrs from va lists. @@ -112679,7 +112679,7 @@ diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums -@@ -30699,7 +30699,7 @@ Called by update_gpu_driver_bug_workaround_entries.py.--> +@@ -30700,7 +30700,7 @@ Called by update_gpu_driver_bug_workaround_entries.py.--> @@ -112688,7 +112688,7 @@ diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums -@@ -31367,7 +31367,7 @@ Called by update_gpu_driver_bug_workaround_entries.py.--> +@@ -31368,7 +31368,7 @@ Called by update_gpu_driver_bug_workaround_entries.py.--> Deprecated as of 07/2018. The corresponding metric was deleted in @@ -112697,7 +112697,7 @@ diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums -@@ -32353,41 +32353,41 @@ Called by update_gpu_driver_bug_workaround_entries.py.--> +@@ -32354,41 +32354,41 @@ Called by update_gpu_driver_bug_workaround_entries.py.--> @@ -112769,7 +112769,7 @@ diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums -@@ -48156,7 +48156,7 @@ Called by update_net_trust_anchors.py.--> +@@ -48157,7 +48157,7 @@ Called by update_net_trust_anchors.py.--> @@ -112778,7 +112778,7 @@ diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums -@@ -48193,7 +48193,7 @@ Called by update_net_trust_anchors.py.--> +@@ -48194,7 +48194,7 @@ Called by update_net_trust_anchors.py.--> @@ -112787,7 +112787,7 @@ diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums -@@ -52070,10 +52070,10 @@ Called by update_net_trust_anchors.py.--> +@@ -52071,10 +52071,10 @@ Called by update_net_trust_anchors.py.--> diff --git a/build/patches/Bromite-AdBlockUpdaterService.patch b/build/patches/Bromite-AdBlockUpdaterService.patch index bc5bc0d5..7d3ae956 100644 --- a/build/patches/Bromite-AdBlockUpdaterService.patch +++ b/build/patches/Bromite-AdBlockUpdaterService.patch @@ -37,7 +37,7 @@ Download filters by checking Last-Modified header first diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java --- a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java -@@ -277,6 +277,14 @@ public class FeatureUtilities { +@@ -278,6 +278,14 @@ public class FeatureUtilities { cacheServiceManagerForBackgroundPrefetch(); } @@ -52,7 +52,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUti /** * @return True if tab model merging for Android N+ is enabled. */ -@@ -845,5 +853,7 @@ public class FeatureUtilities { +@@ -871,5 +879,7 @@ public class FeatureUtilities { void setCustomTabVisible(boolean visible); void setIsInMultiWindowMode(boolean isInMultiWindowMode); boolean isNetworkServiceWarmUpEnabled(); diff --git a/build/patches/Disable-DRM-media-origin-IDs-preprovisioning.patch b/build/patches/Disable-DRM-media-origin-IDs-preprovisioning.patch new file mode 100644 index 00000000..aee1bd4a --- /dev/null +++ b/build/patches/Disable-DRM-media-origin-IDs-preprovisioning.patch @@ -0,0 +1,23 @@ +From: csagan5 <32685696+csagan5@users.noreply.github.com> +Date: Fri, 24 Jan 2020 09:46:48 +0100 +Subject: Disable DRM media origin IDs preprovisioning + +--- + media/base/media_switches.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc +--- a/media/base/media_switches.cc ++++ b/media/base/media_switches.cc +@@ -442,7 +442,7 @@ const base::Feature kMediaDrmPersistentLicense{ + // MediaDrmBridge. If disabled, MediaDrmBridge will get unprovisioned origin IDs + // which will trigger provisioning process after MediaDrmBridge is created. + const base::Feature kMediaDrmPreprovisioning{"MediaDrmPreprovisioning", +- base::FEATURE_ENABLED_BY_DEFAULT}; ++ base::FEATURE_DISABLED_BY_DEFAULT}; + + // Determines if MediaDrmOriginIdManager should attempt to pre-provision origin + // IDs at startup (whenever a profile is loaded). Also used by tests that +-- +2.17.1 + diff --git a/build/patches/Disable-smart-selection-by-default.patch b/build/patches/Disable-smart-selection-by-default.patch new file mode 100644 index 00000000..f8ba1e02 --- /dev/null +++ b/build/patches/Disable-smart-selection-by-default.patch @@ -0,0 +1,41 @@ +From: csagan5 <32685696+csagan5@users.noreply.github.com> +Date: Fri, 24 Jan 2020 19:17:22 +0100 +Subject: Disable smart selection by default + +Allow web search in incognito mode (reverts +commit 48d4ae54f7565c429bf29cd63806aee5d7e93e69) + +Notice that re-enabling smart selection would make incognito mode potentially +leak information through the TextClassifier set by OEM, if any +--- + chrome/browser/android/chrome_feature_list.cc | 2 +- + .../content/browser/selection/SelectionPopupControllerImpl.java | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc +--- a/chrome/browser/android/chrome_feature_list.cc ++++ b/chrome/browser/android/chrome_feature_list.cc +@@ -352,7 +352,7 @@ const base::Feature kChromeSharingHub{"ChromeSharingHub", + base::FEATURE_DISABLED_BY_DEFAULT}; + + const base::Feature kChromeSmartSelection{"ChromeSmartSelection", +- base::FEATURE_ENABLED_BY_DEFAULT}; ++ base::FEATURE_DISABLED_BY_DEFAULT}; + + const base::Feature kClickToCallOpenDialerDirectly{ + "ClickToCallOpenDialerDirectly", base::FEATURE_ENABLED_BY_DEFAULT}; +diff --git a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java +--- a/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java ++++ b/content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java +@@ -774,7 +774,7 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper + menu.removeItem(R.id.select_action_menu_share); + } + +- if (isFocusedNodeEditable() || isIncognito() ++ if (isFocusedNodeEditable() + || !isSelectActionModeAllowed(MENU_ITEM_WEB_SEARCH)) { + menu.removeItem(R.id.select_action_menu_web_search); + } +-- +2.17.1 + diff --git a/build/patches/Multiple-fingerprinting-mitigations-for-canvas-text-and-client-rectangles.patch b/build/patches/Multiple-fingerprinting-mitigations-for-canvas-text-and-client-rectangles.patch index 5b99da66..3726365c 100644 --- a/build/patches/Multiple-fingerprinting-mitigations-for-canvas-text-and-client-rectangles.patch +++ b/build/patches/Multiple-fingerprinting-mitigations-for-canvas-text-and-client-rectangles.patch @@ -76,7 +76,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #include "third_party/leveldatabase/leveldb_features.h" #include "ui/accessibility/accessibility_features.h" #include "ui/accessibility/accessibility_switches.h" -@@ -1466,12 +1467,24 @@ const FeatureEntry kFeatureEntries[] = { +@@ -1503,12 +1504,24 @@ const FeatureEntry kFeatureEntries[] = { {"enable-webrtc-srtp-aes-gcm", flag_descriptions::kWebrtcSrtpAesGcmName, flag_descriptions::kWebrtcSrtpAesGcmDescription, kOsAll, SINGLE_VALUE_TYPE(switches::kEnableWebRtcSrtpAesGcm)}, diff --git a/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch b/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch index 5da27c75..243f349b 100644 --- a/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch +++ b/build/patches/Reduce-HTTP-headers-in-DoH-requests-to-bare-minimum.patch @@ -4,27 +4,27 @@ Subject: Reduce HTTP headers in DoH requests to bare minimum Serve DoH requests with maximum priority. --- - net/base/load_flags_list.h | 6 ++++++ + net/base/load_flags_list.h | 9 +++++++++ net/dns/dns_transaction.cc | 3 ++- net/url_request/url_request_http_job.cc | 16 +++++++++++----- - 3 files changed, 19 insertions(+), 6 deletions(-) + 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/net/base/load_flags_list.h b/net/base/load_flags_list.h --- a/net/base/load_flags_list.h +++ b/net/base/load_flags_list.h -@@ -106,6 +106,12 @@ LOAD_FLAG(SUPPORT_ASYNC_REVALIDATION, 1 << 16) - // the LOAD_CAN_USE_RESTRICTED_PREFETCH load flag. - LOAD_FLAG(RESTRICTED_PREFETCH, 1 << 17) - +@@ -112,3 +112,12 @@ LOAD_FLAG(RESTRICTED_PREFETCH, 1 << 17) + // is considered privileged, and therefore this flag must only be set from a + // trusted process. + LOAD_FLAG(CAN_USE_RESTRICTED_PREFETCH, 1 << 18) ++ ++ ++ ++ +// This load will not send Accept-Language or User-Agent headers, and not +// advertise brotli encoding. +// Used to comply with IETF (draft) DNS-over-HTTPS: +// "Implementors SHOULD NOT set non-essential HTTP headers in DoH client requests." -+LOAD_FLAG(MINIMAL_HEADERS, 1 << 18) -+ - // This flag must be set on requests that are allowed to reuse cache entries - // that are marked as RESTRICTED_PREFETCH. Requests without this flag cannot - // reuse restricted prefetch responses in the cache. Restricted response reuse ++LOAD_FLAG(MINIMAL_HEADERS, 1 << 19) diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc --- a/net/dns/dns_transaction.cc +++ b/net/dns/dns_transaction.cc diff --git a/build/patches/Revert-Cleanup-Search-Ready-Omnibox-flag-since-it-has-launched.patch b/build/patches/Revert-Cleanup-Search-Ready-Omnibox-flag-since-it-has-launched.patch index 6de8c683..9b98cfbc 100644 --- a/build/patches/Revert-Cleanup-Search-Ready-Omnibox-flag-since-it-has-launched.patch +++ b/build/patches/Revert-Cleanup-Search-Ready-Omnibox-flag-since-it-has-launched.patch @@ -45,7 +45,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggest diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -1972,6 +1972,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2009,6 +2009,9 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kAndroidAutofillAccessibilityName, flag_descriptions::kAndroidAutofillAccessibilityDescription, kOsAndroid, FEATURE_VALUE_TYPE(features::kAndroidAutofillAccessibility)}, diff --git a/build/patches/Revert-Merge-to-M78-Enable-AImageReader-by-default.patch b/build/patches/Revert-Merge-to-M78-Enable-AImageReader-by-default.patch index 7bc58e4a..9b54b9b6 100644 --- a/build/patches/Revert-Merge-to-M78-Enable-AImageReader-by-default.patch +++ b/build/patches/Revert-Merge-to-M78-Enable-AImageReader-by-default.patch @@ -6,11 +6,11 @@ This reverts commit 60c3d4531b180b911767fb3ea7c3553d7f408c25. Automatically disable hardware acceleration for Android Q on arm64 --- - chrome/browser/android/chrome_startup_flags.cc | 9 +++++++++ + chrome/browser/android/chrome_startup_flags.cc | 2 ++ gpu/config/gpu_finch_features.cc | 2 +- gpu/ipc/service/gpu_init.cc | 8 ++------ media/base/media_switches.cc | 2 +- - 4 files changed, 13 insertions(+), 8 deletions(-) + 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/chrome/browser/android/chrome_startup_flags.cc b/chrome/browser/android/chrome_startup_flags.cc --- a/chrome/browser/android/chrome_startup_flags.cc @@ -31,20 +31,6 @@ diff --git a/chrome/browser/android/chrome_startup_flags.cc b/chrome/browser/and #include "media/base/media_switches.h" namespace { -@@ -40,6 +42,13 @@ void SetChromeSpecificCommandLineFlags() { - if (base::SysInfo::IsLowEndDevice()) - SetCommandLineSwitchASCII(switches::kDisableSyncTypes, "Favicon Images"); - -+#ifdef ARCH_CPU_ARM64 -+ // workaround for Android 10 "Q" arm64 crash -+ if (base::android::BuildInfo::GetInstance()->sdk_int() > base::android::SDK_VERSION_P) { -+ SetCommandLineSwitchASCII(switches::kDisableAcceleratedVideoDecode, "true"); -+ } -+#endif -+ - // Enable DOM Distiller backend. - SetCommandLineSwitch(switches::kEnableDomDistiller); - } diff --git a/gpu/config/gpu_finch_features.cc b/gpu/config/gpu_finch_features.cc --- a/gpu/config/gpu_finch_features.cc +++ b/gpu/config/gpu_finch_features.cc diff --git a/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch b/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch index 5b77ee85..a6668b46 100644 --- a/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch +++ b/build/patches/Revert-flags-remove-disable-pull-to-refresh-effect.patch @@ -13,7 +13,7 @@ This reverts commit 4e598f38a0e6dd3dbede009c6a99b2a520a94e1f. diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -1997,6 +1997,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2034,6 +2034,10 @@ const FeatureEntry kFeatureEntries[] = { SINGLE_VALUE_TYPE(switches::kHostedAppQuitNotification)}, #endif // OS_MACOSX #if defined(OS_ANDROID) diff --git a/build/patches/User-Agent-anonymize.patch b/build/patches/User-Agent-anonymize.patch index 074e9557..6b7e8ff1 100644 --- a/build/patches/User-Agent-anonymize.patch +++ b/build/patches/User-Agent-anonymize.patch @@ -18,7 +18,7 @@ diff --git a/components/version_info/version_info.cc b/components/version_info/v std::string GetProductNameAndVersionForUserAgent() { - return "Chrome/" + GetVersionNumber(); + // latest stable version -+ return "Chrome/79.0.3945.116"; ++ return "Chrome/79.0.3945.136"; } std::string GetProductName() { -- GitLab From bb184ab1f66854a29a0b4d45ced7064b3a7817e6 Mon Sep 17 00:00:00 2001 From: Sooraj Date: Tue, 28 Jan 2020 02:40:01 +0530 Subject: [PATCH 5/6] Remove un-needed patches and fix search engines --- build/bromite_patches_list.txt | 4 +- ...DuckGo-Light-and-qwant-saerch-engine.patch | 37 + .../Add-DuckDuckGo-Lite-search-engine.patch | 613 ---------- .../Add-English-only-search-engine.patch | 1024 ----------------- build/patches/Add-Qwant-search-engine.patch | 992 ---------------- build/patches/e-set-search-engines.patch | 563 +++++---- 6 files changed, 369 insertions(+), 2864 deletions(-) create mode 100644 build/patches/0002-Fix-DuckDuckGo-Light-and-qwant-saerch-engine.patch delete mode 100644 build/patches/Add-DuckDuckGo-Lite-search-engine.patch delete mode 100644 build/patches/Add-English-only-search-engine.patch delete mode 100644 build/patches/Add-Qwant-search-engine.patch diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index b35f0149..3bcda483 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -42,9 +42,6 @@ Remove-background-sync-and-translate-menu-options.patch Hide-passwords-manager-link.patch Disable-Omaha-update-checks.patch Disable-update-scheduler.patch -Add-English-only-search-engine.patch -Add-DuckDuckGo-Lite-search-engine.patch -Add-Qwant-search-engine.patch Fix-crash-when-accessing-page-info-site-settings.patch openH264-enable-ARM-ARM64-optimizations.patch Switch-to-fstack-protector-strong.patch @@ -161,3 +158,4 @@ e-fix-settings-crash-issue.patch e-enable-custom-tabs-by-default.patch Fix-About-Chrome-regression.patch 0001-Launcher-icon-updated.patch +0002-Fix-DuckDuckGo-Light-and-qwant-saerch-engine.patch \ No newline at end of file diff --git a/build/patches/0002-Fix-DuckDuckGo-Light-and-qwant-saerch-engine.patch b/build/patches/0002-Fix-DuckDuckGo-Light-and-qwant-saerch-engine.patch new file mode 100644 index 00000000..dbf86e62 --- /dev/null +++ b/build/patches/0002-Fix-DuckDuckGo-Light-and-qwant-saerch-engine.patch @@ -0,0 +1,37 @@ +From d8ed055cc54a14e1269585364b5241d83975e996 Mon Sep 17 00:00:00 2001 +From: Sooraj +Date: Tue, 28 Jan 2020 02:36:50 +0530 +Subject: [PATCH] Fix DuckDuckGo Light and qwant saerch engine + +--- + components/search_engines/prepopulated_engines.json | 1 + + components/search_engines/search_engine_type.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json +index 77c92706afac..6c7cf7635c2a 100644 +--- a/components/search_engines/prepopulated_engines.json ++++ b/components/search_engines/prepopulated_engines.json +@@ -61,6 +61,7 @@ + "favicon_url": "https://www.qwant.com/favicon.ico", + "search_url": "https://www.qwant.com/?q={searchTerms}&client=opensearch", + "suggest_url": "https://api.qwant.com/api/suggest/?q={searchTerms}&client=opensearch", ++ "image_url": "https://www.qwant.com/?t=images&q={searchTerms}", + "type": "SEARCH_ENGINE_QWANT", + "id": 3 + }, +diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h +index 355569fa52fd..036987c1b221 100644 +--- a/components/search_engines/search_engine_type.h ++++ b/components/search_engines/search_engine_type.h +@@ -65,6 +65,7 @@ enum SearchEngineType { + SEARCH_ENGINE_360, + SEARCH_ENGINE_COCCOC, + SEARCH_ENGINE_DUCKDUCKGO, ++ SEARCH_ENGINE_DUCKDUCKGOLIGHT, + SEARCH_ENGINE_PARSIJOO, + SEARCH_ENGINE_QWANT, + SEARCH_ENGINE_GIVERO, +-- +2.23.0 + diff --git a/build/patches/Add-DuckDuckGo-Lite-search-engine.patch b/build/patches/Add-DuckDuckGo-Lite-search-engine.patch deleted file mode 100644 index c24b4adf..00000000 --- a/build/patches/Add-DuckDuckGo-Lite-search-engine.patch +++ /dev/null @@ -1,613 +0,0 @@ -From: csagan5 <32685696+csagan5@users.noreply.github.com> -Date: Thu, 12 Oct 2017 11:06:18 +0200 -Subject: Add DuckDuckGo Lite search engine - ---- - .../search_engines/prepopulated_engines.json | 10 ++ - .../search_engines/search_engine_type.h | 1 + - .../template_url_prepopulate_data.cc | 122 +++++++++--------- - 3 files changed, 75 insertions(+), 58 deletions(-) - -diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json ---- a/components/search_engines/prepopulated_engines.json -+++ b/components/search_engines/prepopulated_engines.json -@@ -91,6 +91,16 @@ - "id": 68 - }, - -+ "duckduckgo_light": { -+ "name": "DuckDuckGo Light", -+ "keyword": "duckduckgo.com/lite", -+ "favicon_url": "https://duckduckgo.com/favicon.ico", -+ "search_url": "https://duckduckgo.com/lite/?q={searchTerms}", -+ "suggest_url": "https://duckduckgo.com/ac/?q={searchTerms}&type=list", -+ "type": "SEARCH_ENGINE_DUCKDUCKGOLIGHT", -+ "id": 12 -+ }, -+ - "duckduckgo": { - "name": "DuckDuckGo", - "keyword": "duckduckgo.com", -diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h ---- a/components/search_engines/search_engine_type.h -+++ b/components/search_engines/search_engine_type.h -@@ -65,6 +65,7 @@ enum SearchEngineType { - SEARCH_ENGINE_360, - SEARCH_ENGINE_COCCOC, - SEARCH_ENGINE_DUCKDUCKGO, -+ SEARCH_ENGINE_DUCKDUCKGOLIGHT, - SEARCH_ENGINE_PARSIJOO, - SEARCH_ENGINE_QWANT, - SEARCH_ENGINE_GIVERO, -diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc ---- a/components/search_engines/template_url_prepopulate_data.cc -+++ b/components/search_engines/template_url_prepopulate_data.cc -@@ -35,6 +35,7 @@ const PrepopulatedEngine* const engines_default[] = { - &googleen, &google, - &bing, - &yahoo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Note, the below entries are sorted by country code, not the name in comment. -@@ -44,7 +45,7 @@ const PrepopulatedEngine* const engines_AE[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Albania -@@ -60,7 +61,7 @@ const PrepopulatedEngine* const engines_AR[] = { - &googleen, &google, - &bing, - &yahoo_ar, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Austria -@@ -68,7 +69,7 @@ const PrepopulatedEngine* const engines_AT[] = { - &googleen, &google, - &bing, - &yahoo_at, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Australia -@@ -76,7 +77,7 @@ const PrepopulatedEngine* const engines_AU[] = { - &googleen, &google, - &bing, - &yahoo_au, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Bosnia and Herzegovina -@@ -92,7 +93,7 @@ const PrepopulatedEngine* const engines_BE[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Bulgaria -@@ -124,7 +125,7 @@ const PrepopulatedEngine* const engines_BN[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Bolivia -@@ -132,7 +133,7 @@ const PrepopulatedEngine* const engines_BO[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Brazil -@@ -140,7 +141,7 @@ const PrepopulatedEngine* const engines_BR[] = { - &googleen, &google, - &bing, - &yahoo_br, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Belarus -@@ -157,11 +158,12 @@ const PrepopulatedEngine* const engines_BZ[] = { - &bing, - &yahoo, - &duckduckgo, -+ &duckduckgo_light, - }; - - // Canada - const PrepopulatedEngine* const engines_CA[] = { -- &googleen, &google, &bing, &yahoo_ca, &yahoo_qc, &duckduckgo, -+ &googleen, &google, &bing, &yahoo_ca, &yahoo_qc, &duckduckgo, &duckduckgo_light, - }; - - // Switzerland -@@ -169,6 +171,7 @@ const PrepopulatedEngine* const engines_CH[] = { - &googleen, &google, - &bing, - &duckduckgo, -+ &duckduckgo_light, - &yahoo_ch, - }; - -@@ -177,7 +180,7 @@ const PrepopulatedEngine* const engines_CL[] = { - &googleen, &google, - &bing, - &yahoo_cl, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // China -@@ -190,7 +193,7 @@ const PrepopulatedEngine* const engines_CO[] = { - &googleen, &google, - &yahoo_co, - &bing, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Costa Rica -@@ -198,7 +201,7 @@ const PrepopulatedEngine* const engines_CR[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Czech Republic -@@ -214,7 +217,7 @@ const PrepopulatedEngine* const engines_DE[] = { - &googleen, &google, - &bing, - &yahoo_de, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Denmark -@@ -222,7 +225,7 @@ const PrepopulatedEngine* const engines_DK[] = { - &googleen, &google, - &bing, - &yahoo_dk, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Dominican Republic -@@ -230,7 +233,7 @@ const PrepopulatedEngine* const engines_DO[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Algeria -@@ -246,7 +249,7 @@ const PrepopulatedEngine* const engines_EC[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Estonia -@@ -270,7 +273,7 @@ const PrepopulatedEngine* const engines_ES[] = { - &googleen, &google, - &bing, - &yahoo_es, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Finland -@@ -278,7 +281,7 @@ const PrepopulatedEngine* const engines_FI[] = { - &googleen, &google, - &bing, - &yahoo_fi, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Faroe Islands -@@ -286,7 +289,7 @@ const PrepopulatedEngine* const engines_FO[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // France -@@ -302,7 +305,7 @@ const PrepopulatedEngine* const engines_GB[] = { - &googleen, &google, - &bing, - &yahoo_uk, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Greece -@@ -310,7 +313,7 @@ const PrepopulatedEngine* const engines_GR[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Guatemala -@@ -318,7 +321,7 @@ const PrepopulatedEngine* const engines_GT[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Hong Kong -@@ -334,7 +337,7 @@ const PrepopulatedEngine* const engines_HN[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Croatia -@@ -342,7 +345,7 @@ const PrepopulatedEngine* const engines_HR[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Hungary -@@ -350,7 +353,7 @@ const PrepopulatedEngine* const engines_HU[] = { - &googleen, &google, - &yahoo, - &bing, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Indonesia -@@ -358,7 +361,7 @@ const PrepopulatedEngine* const engines_ID[] = { - &googleen, &google, - &yahoo_id, - &bing, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Ireland -@@ -366,7 +369,7 @@ const PrepopulatedEngine* const engines_IE[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Israel -@@ -382,7 +385,7 @@ const PrepopulatedEngine* const engines_IN[] = { - &googleen, &google, - &yahoo_in, - &bing, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Iraq -@@ -405,7 +408,7 @@ const PrepopulatedEngine* const engines_IS[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Italy -@@ -413,7 +416,7 @@ const PrepopulatedEngine* const engines_IT[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Jamaica -@@ -421,7 +424,7 @@ const PrepopulatedEngine* const engines_JM[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Jordan -@@ -445,7 +448,7 @@ const PrepopulatedEngine* const engines_KE[] = { - &googleen, &google, - &yahoo, - &bing, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // South Korea -@@ -478,6 +481,7 @@ const PrepopulatedEngine* const engines_LB[] = { - &bing, - &yahoo, - &duckduckgo, -+ &duckduckgo_light, - }; - - // Liechtenstein -@@ -485,6 +489,7 @@ const PrepopulatedEngine* const engines_LI[] = { - &googleen, &google, - &bing, - &duckduckgo, -+ &duckduckgo_light, - &yahoo, - }; - -@@ -500,7 +505,7 @@ const PrepopulatedEngine* const engines_LT[] = { - const PrepopulatedEngine* const engines_LU[] = { - &googleen, &google, - &bing, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - &yahoo, - }; - -@@ -533,7 +538,7 @@ const PrepopulatedEngine* const engines_MC[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Moldova -@@ -541,7 +546,7 @@ const PrepopulatedEngine* const engines_MD[] = { - &googleen, &google, - &yandex_ru, - &mail_ru, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Montenegro -@@ -557,7 +562,7 @@ const PrepopulatedEngine* const engines_MK[] = { - &googleen, &google, - &yahoo, - &bing, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Mexico -@@ -565,7 +570,7 @@ const PrepopulatedEngine* const engines_MX[] = { - &googleen, &google, - &bing, - &yahoo_mx, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Malaysia -@@ -581,7 +586,7 @@ const PrepopulatedEngine* const engines_NI[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Netherlands -@@ -589,7 +594,7 @@ const PrepopulatedEngine* const engines_NL[] = { - &googleen, &google, - &bing, - &yahoo_nl, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Norway -@@ -598,13 +603,14 @@ const PrepopulatedEngine* const engines_NO[] = { - &bing, - &yahoo, - &duckduckgo, -+ &duckduckgo_light, - }; - - // New Zealand - const PrepopulatedEngine* const engines_NZ[] = { - &googleen, &google, - &bing, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - &yahoo_nz, - }; - -@@ -621,7 +627,7 @@ const PrepopulatedEngine* const engines_PA[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Peru -@@ -629,7 +635,7 @@ const PrepopulatedEngine* const engines_PE[] = { - &googleen, &google, - &yahoo_pe, - &bing, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Philippines -@@ -637,7 +643,7 @@ const PrepopulatedEngine* const engines_PH[] = { - &googleen, &google, - &yahoo_ph, - &bing, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Pakistan -@@ -653,7 +659,7 @@ const PrepopulatedEngine* const engines_PL[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Puerto Rico -@@ -661,7 +667,7 @@ const PrepopulatedEngine* const engines_PR[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Portugal -@@ -669,7 +675,7 @@ const PrepopulatedEngine* const engines_PT[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Paraguay -@@ -677,7 +683,7 @@ const PrepopulatedEngine* const engines_PY[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Qatar -@@ -693,7 +699,7 @@ const PrepopulatedEngine* const engines_RO[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Serbia -@@ -701,7 +707,7 @@ const PrepopulatedEngine* const engines_RS[] = { - &googleen, &google, - &yahoo, - &bing, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Russia -@@ -733,7 +739,7 @@ const PrepopulatedEngine* const engines_SE[] = { - &googleen, &google, - &bing, - &yahoo_se, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Singapore -@@ -749,7 +755,7 @@ const PrepopulatedEngine* const engines_SI[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Slovakia -@@ -757,7 +763,7 @@ const PrepopulatedEngine* const engines_SK[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // El Salvador -@@ -765,7 +771,7 @@ const PrepopulatedEngine* const engines_SV[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Syria -@@ -805,7 +811,7 @@ const PrepopulatedEngine* const engines_TT[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Taiwan -@@ -837,7 +843,7 @@ const PrepopulatedEngine* const engines_US[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Uruguay -@@ -845,7 +851,7 @@ const PrepopulatedEngine* const engines_UY[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Venezuela -@@ -853,7 +859,7 @@ const PrepopulatedEngine* const engines_VE[] = { - &googleen, &google, - &yahoo_ve, - &bing, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Vietnam -@@ -877,7 +883,7 @@ const PrepopulatedEngine* const engines_ZA[] = { - &googleen, &google, - &bing, - &yahoo, -- &duckduckgo, -+ &duckduckgo, &duckduckgo_light, - }; - - // Zimbabwe --- -2.17.1 - diff --git a/build/patches/Add-English-only-search-engine.patch b/build/patches/Add-English-only-search-engine.patch deleted file mode 100644 index 93b4dd75..00000000 --- a/build/patches/Add-English-only-search-engine.patch +++ /dev/null @@ -1,1024 +0,0 @@ -From: csagan5 <32685696+csagan5@users.noreply.github.com> -Date: Mon, 11 Dec 2017 22:42:11 +0100 -Subject: Add English-only search engine - -Add a Google search engine that forces languages to English, -disable from all its searches RLZ and field experiments querystring parameters. ---- - .../search_engines/prepopulated_engines.json | 21 ++ - .../search_engines/search_engine_type.h | 1 + - .../template_url_prepopulate_data.cc | 216 +++++++++--------- - 3 files changed, 130 insertions(+), 108 deletions(-) - -diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json ---- a/components/search_engines/prepopulated_engines.json -+++ b/components/search_engines/prepopulated_engines.json -@@ -122,6 +122,27 @@ - "id": 1 - }, - -+ "googleen": { -+ "name": "Google in English", -+ "keyword": "googleen", -+ "favicon_url": "https://www.google.com/favicon.ico", -+ "search_url": "{google:baseURL}search?q={searchTerms}&{google:originalQueryForSuggestion}{google:iOSSearchLanguage}{google:searchClient}{google:contextualSearchVersion}ie={inputEncoding}&hl=en", -+ "suggest_url": "{google:baseSuggestURL}search?client={google:suggestClient}&gs_ri={google:suggestRid}&xssi=t&q={searchTerms}&{google:inputType}{google:pageClassification}{google:searchVersion}{google:prefetchQuery}sugkey={google:suggestAPIKeyParameter}&hl=en", -+ "image_url": "{google:baseURL}searchbyimage/upload?hl=en", -+ "new_tab_url": "{google:baseURL}_/chrome/newtab?hl=en&ie={inputEncoding}", -+ "contextual_search_url": "{google:baseURL}_/contextualsearch?{google:contextualSearchVersion}{google:contextualSearchContextData}&hl=en", -+ "image_url_post_params": "encoded_image={google:imageThumbnail},image_url={google:imageURL},sbisrc={google:imageSearchSource},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight}", -+ "alternate_urls": [ -+ "{google:baseURL}?hl=en#q={searchTerms}", -+ "{google:baseURL}search?hl=en#q={searchTerms}", -+ "{google:baseURL}webhp?hl=en#q={searchTerms}", -+ "{google:baseURL}s?hl=en#q={searchTerms}", -+ "{google:baseURL}s?hl=en&q={searchTerms}" -+ ], -+ "type": "SEARCH_ENGINE_GOOGLE_EN", -+ "id": 13 -+ }, -+ - "mail_ru": { - "name": "@MAIL.RU", - "keyword": "mail.ru", -diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h ---- a/components/search_engines/search_engine_type.h -+++ b/components/search_engines/search_engine_type.h -@@ -74,6 +74,7 @@ enum SearchEngineType { - SEARCH_ENGINE_OCEANHERO, - SEARCH_ENGINE_PRIVACYWALL, - -+ SEARCH_ENGINE_GOOGLE_EN, - SEARCH_ENGINE_MAX // Bounding value needed for UMA histogram macro. - }; - -diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc ---- a/components/search_engines/template_url_prepopulate_data.cc -+++ b/components/search_engines/template_url_prepopulate_data.cc -@@ -32,7 +32,7 @@ namespace { - - // Default (for countries with no better engine set) - const PrepopulatedEngine* const engines_default[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - }; -@@ -41,7 +41,7 @@ const PrepopulatedEngine* const engines_default[] = { - // Engine selection by country ------------------------------------------------ - // United Arab Emirates - const PrepopulatedEngine* const engines_AE[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -49,7 +49,7 @@ const PrepopulatedEngine* const engines_AE[] = { - - // Albania - const PrepopulatedEngine* const engines_AL[] = { -- &google, -+ &googleen, &google, - &yahoo, - &bing, - &ask, -@@ -57,7 +57,7 @@ const PrepopulatedEngine* const engines_AL[] = { - - // Argentina - const PrepopulatedEngine* const engines_AR[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo_ar, - &duckduckgo, -@@ -65,7 +65,7 @@ const PrepopulatedEngine* const engines_AR[] = { - - // Austria - const PrepopulatedEngine* const engines_AT[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo_at, - &duckduckgo, -@@ -73,7 +73,7 @@ const PrepopulatedEngine* const engines_AT[] = { - - // Australia - const PrepopulatedEngine* const engines_AU[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo_au, - &duckduckgo, -@@ -81,7 +81,7 @@ const PrepopulatedEngine* const engines_AU[] = { - - // Bosnia and Herzegovina - const PrepopulatedEngine* const engines_BA[] = { -- &google, -+ &googleen, &google, - &yahoo, - &bing, - &ask, -@@ -89,7 +89,7 @@ const PrepopulatedEngine* const engines_BA[] = { - - // Belgium - const PrepopulatedEngine* const engines_BE[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -97,7 +97,7 @@ const PrepopulatedEngine* const engines_BE[] = { - - // Bulgaria - const PrepopulatedEngine* const engines_BG[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &yandex_ru, -@@ -105,7 +105,7 @@ const PrepopulatedEngine* const engines_BG[] = { - - // Bahrain - const PrepopulatedEngine* const engines_BH[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &ask, -@@ -113,7 +113,7 @@ const PrepopulatedEngine* const engines_BH[] = { - - // Burundi - const PrepopulatedEngine* const engines_BI[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &yandex_ru, -@@ -121,7 +121,7 @@ const PrepopulatedEngine* const engines_BI[] = { - - // Brunei - const PrepopulatedEngine* const engines_BN[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -129,7 +129,7 @@ const PrepopulatedEngine* const engines_BN[] = { - - // Bolivia - const PrepopulatedEngine* const engines_BO[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -137,7 +137,7 @@ const PrepopulatedEngine* const engines_BO[] = { - - // Brazil - const PrepopulatedEngine* const engines_BR[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo_br, - &duckduckgo, -@@ -145,7 +145,7 @@ const PrepopulatedEngine* const engines_BR[] = { - - // Belarus - const PrepopulatedEngine* const engines_BY[] = { -- &google, -+ &googleen, &google, - &yandex_by, - &mail_ru, - &bing, -@@ -153,7 +153,7 @@ const PrepopulatedEngine* const engines_BY[] = { - - // Belize - const PrepopulatedEngine* const engines_BZ[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -161,12 +161,12 @@ const PrepopulatedEngine* const engines_BZ[] = { - - // Canada - const PrepopulatedEngine* const engines_CA[] = { -- &google, &bing, &yahoo_ca, &yahoo_qc, &duckduckgo, -+ &googleen, &google, &bing, &yahoo_ca, &yahoo_qc, &duckduckgo, - }; - - // Switzerland - const PrepopulatedEngine* const engines_CH[] = { -- &google, -+ &googleen, &google, - &bing, - &duckduckgo, - &yahoo_ch, -@@ -174,7 +174,7 @@ const PrepopulatedEngine* const engines_CH[] = { - - // Chile - const PrepopulatedEngine* const engines_CL[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo_cl, - &duckduckgo, -@@ -182,12 +182,12 @@ const PrepopulatedEngine* const engines_CL[] = { - - // China - const PrepopulatedEngine* const engines_CN[] = { -- &baidu, &so_360, &google, &sogou, &bing, -+ &baidu, &so_360, &googleen, &google, &sogou, &bing, - }; - - // Colombia - const PrepopulatedEngine* const engines_CO[] = { -- &google, -+ &googleen, &google, - &yahoo_co, - &bing, - &duckduckgo, -@@ -195,7 +195,7 @@ const PrepopulatedEngine* const engines_CO[] = { - - // Costa Rica - const PrepopulatedEngine* const engines_CR[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -203,7 +203,7 @@ const PrepopulatedEngine* const engines_CR[] = { - - // Czech Republic - const PrepopulatedEngine* const engines_CZ[] = { -- &google, -+ &googleen, &google, - &seznam_cz, - &bing, - &yahoo, -@@ -211,7 +211,7 @@ const PrepopulatedEngine* const engines_CZ[] = { - - // Germany - const PrepopulatedEngine* const engines_DE[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo_de, - &duckduckgo, -@@ -219,7 +219,7 @@ const PrepopulatedEngine* const engines_DE[] = { - - // Denmark - const PrepopulatedEngine* const engines_DK[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo_dk, - &duckduckgo, -@@ -227,7 +227,7 @@ const PrepopulatedEngine* const engines_DK[] = { - - // Dominican Republic - const PrepopulatedEngine* const engines_DO[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -235,7 +235,7 @@ const PrepopulatedEngine* const engines_DO[] = { - - // Algeria - const PrepopulatedEngine* const engines_DZ[] = { -- &google, -+ &googleen, &google, - &yahoo, - &bing, - &yandex_ru, -@@ -243,7 +243,7 @@ const PrepopulatedEngine* const engines_DZ[] = { - - // Ecuador - const PrepopulatedEngine* const engines_EC[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -251,7 +251,7 @@ const PrepopulatedEngine* const engines_EC[] = { - - // Estonia - const PrepopulatedEngine* const engines_EE[] = { -- &google, -+ &googleen, &google, - &bing, - &yandex_ru, - &neti, -@@ -259,7 +259,7 @@ const PrepopulatedEngine* const engines_EE[] = { - - // Egypt - const PrepopulatedEngine* const engines_EG[] = { -- &google, -+ &googleen, &google, - &yahoo, - &bing, - &yandex_ru, -@@ -267,7 +267,7 @@ const PrepopulatedEngine* const engines_EG[] = { - - // Spain - const PrepopulatedEngine* const engines_ES[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo_es, - &duckduckgo, -@@ -275,7 +275,7 @@ const PrepopulatedEngine* const engines_ES[] = { - - // Finland - const PrepopulatedEngine* const engines_FI[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo_fi, - &duckduckgo, -@@ -283,7 +283,7 @@ const PrepopulatedEngine* const engines_FI[] = { - - // Faroe Islands - const PrepopulatedEngine* const engines_FO[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -291,7 +291,7 @@ const PrepopulatedEngine* const engines_FO[] = { - - // France - const PrepopulatedEngine* const engines_FR[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo_fr, - &qwant, -@@ -299,7 +299,7 @@ const PrepopulatedEngine* const engines_FR[] = { - - // United Kingdom - const PrepopulatedEngine* const engines_GB[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo_uk, - &duckduckgo, -@@ -307,7 +307,7 @@ const PrepopulatedEngine* const engines_GB[] = { - - // Greece - const PrepopulatedEngine* const engines_GR[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -315,7 +315,7 @@ const PrepopulatedEngine* const engines_GR[] = { - - // Guatemala - const PrepopulatedEngine* const engines_GT[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -323,7 +323,7 @@ const PrepopulatedEngine* const engines_GT[] = { - - // Hong Kong - const PrepopulatedEngine* const engines_HK[] = { -- &google, -+ &googleen, &google, - &yahoo_hk, - &bing, - &baidu, -@@ -331,7 +331,7 @@ const PrepopulatedEngine* const engines_HK[] = { - - // Honduras - const PrepopulatedEngine* const engines_HN[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -339,7 +339,7 @@ const PrepopulatedEngine* const engines_HN[] = { - - // Croatia - const PrepopulatedEngine* const engines_HR[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -347,7 +347,7 @@ const PrepopulatedEngine* const engines_HR[] = { - - // Hungary - const PrepopulatedEngine* const engines_HU[] = { -- &google, -+ &googleen, &google, - &yahoo, - &bing, - &duckduckgo, -@@ -355,7 +355,7 @@ const PrepopulatedEngine* const engines_HU[] = { - - // Indonesia - const PrepopulatedEngine* const engines_ID[] = { -- &google, -+ &googleen, &google, - &yahoo_id, - &bing, - &duckduckgo, -@@ -363,7 +363,7 @@ const PrepopulatedEngine* const engines_ID[] = { - - // Ireland - const PrepopulatedEngine* const engines_IE[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -371,7 +371,7 @@ const PrepopulatedEngine* const engines_IE[] = { - - // Israel - const PrepopulatedEngine* const engines_IL[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &yandex_ru, -@@ -379,7 +379,7 @@ const PrepopulatedEngine* const engines_IL[] = { - - // India - const PrepopulatedEngine* const engines_IN[] = { -- &google, -+ &googleen, &google, - &yahoo_in, - &bing, - &duckduckgo, -@@ -387,7 +387,7 @@ const PrepopulatedEngine* const engines_IN[] = { - - // Iraq - const PrepopulatedEngine* const engines_IQ[] = { -- &google, -+ &googleen, &google, - &yahoo, - &bing, - &yandex_ru, -@@ -395,14 +395,14 @@ const PrepopulatedEngine* const engines_IQ[] = { - - // Iran - const PrepopulatedEngine* const engines_IR[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - }; - - // Iceland - const PrepopulatedEngine* const engines_IS[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -410,7 +410,7 @@ const PrepopulatedEngine* const engines_IS[] = { - - // Italy - const PrepopulatedEngine* const engines_IT[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -418,7 +418,7 @@ const PrepopulatedEngine* const engines_IT[] = { - - // Jamaica - const PrepopulatedEngine* const engines_JM[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -426,7 +426,7 @@ const PrepopulatedEngine* const engines_JM[] = { - - // Jordan - const PrepopulatedEngine* const engines_JO[] = { -- &google, -+ &googleen, &google, - &yahoo, - &bing, - &yandex_ru, -@@ -434,7 +434,7 @@ const PrepopulatedEngine* const engines_JO[] = { - - // Japan - const PrepopulatedEngine* const engines_JP[] = { -- &google, -+ &googleen, &google, - &yahoo_jp, - &bing, - &baidu, -@@ -442,7 +442,7 @@ const PrepopulatedEngine* const engines_JP[] = { - - // Kenya - const PrepopulatedEngine* const engines_KE[] = { -- &google, -+ &googleen, &google, - &yahoo, - &bing, - &duckduckgo, -@@ -450,7 +450,7 @@ const PrepopulatedEngine* const engines_KE[] = { - - // South Korea - const PrepopulatedEngine* const engines_KR[] = { -- &google, -+ &googleen, &google, - &naver, - &daum, - &bing, -@@ -458,7 +458,7 @@ const PrepopulatedEngine* const engines_KR[] = { - - // Kuwait - const PrepopulatedEngine* const engines_KW[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &ask, -@@ -466,7 +466,7 @@ const PrepopulatedEngine* const engines_KW[] = { - - // Kazakhstan - const PrepopulatedEngine* const engines_KZ[] = { -- &google, -+ &googleen, &google, - &yandex_kz, - &mail_ru, - &bing, -@@ -474,7 +474,7 @@ const PrepopulatedEngine* const engines_KZ[] = { - - // Lebanon - const PrepopulatedEngine* const engines_LB[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -482,7 +482,7 @@ const PrepopulatedEngine* const engines_LB[] = { - - // Liechtenstein - const PrepopulatedEngine* const engines_LI[] = { -- &google, -+ &googleen, &google, - &bing, - &duckduckgo, - &yahoo, -@@ -490,7 +490,7 @@ const PrepopulatedEngine* const engines_LI[] = { - - // Lithuania - const PrepopulatedEngine* const engines_LT[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &yandex_ru, -@@ -498,7 +498,7 @@ const PrepopulatedEngine* const engines_LT[] = { - - // Luxembourg - const PrepopulatedEngine* const engines_LU[] = { -- &google, -+ &googleen, &google, - &bing, - &duckduckgo, - &yahoo, -@@ -506,7 +506,7 @@ const PrepopulatedEngine* const engines_LU[] = { - - // Latvia - const PrepopulatedEngine* const engines_LV[] = { -- &google, -+ &googleen, &google, - &bing, - &yandex_ru, - &yahoo, -@@ -514,7 +514,7 @@ const PrepopulatedEngine* const engines_LV[] = { - - // Libya - const PrepopulatedEngine* const engines_LY[] = { -- &google, -+ &googleen, &google, - &yahoo, - &bing, - &yandex_com, -@@ -522,7 +522,7 @@ const PrepopulatedEngine* const engines_LY[] = { - - // Morocco - const PrepopulatedEngine* const engines_MA[] = { -- &google, -+ &googleen, &google, - &yahoo, - &bing, - &yandex_ru, -@@ -530,7 +530,7 @@ const PrepopulatedEngine* const engines_MA[] = { - - // Monaco - const PrepopulatedEngine* const engines_MC[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -538,7 +538,7 @@ const PrepopulatedEngine* const engines_MC[] = { - - // Moldova - const PrepopulatedEngine* const engines_MD[] = { -- &google, -+ &googleen, &google, - &yandex_ru, - &mail_ru, - &duckduckgo, -@@ -546,7 +546,7 @@ const PrepopulatedEngine* const engines_MD[] = { - - // Montenegro - const PrepopulatedEngine* const engines_ME[] = { -- &google, -+ &googleen, &google, - &yahoo, - &bing, - &yandex_ru, -@@ -554,7 +554,7 @@ const PrepopulatedEngine* const engines_ME[] = { - - // Macedonia - const PrepopulatedEngine* const engines_MK[] = { -- &google, -+ &googleen, &google, - &yahoo, - &bing, - &duckduckgo, -@@ -562,7 +562,7 @@ const PrepopulatedEngine* const engines_MK[] = { - - // Mexico - const PrepopulatedEngine* const engines_MX[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo_mx, - &duckduckgo, -@@ -570,7 +570,7 @@ const PrepopulatedEngine* const engines_MX[] = { - - // Malaysia - const PrepopulatedEngine* const engines_MY[] = { -- &google, -+ &googleen, &google, - &yahoo_my, - &bing, - &baidu, -@@ -578,7 +578,7 @@ const PrepopulatedEngine* const engines_MY[] = { - - // Nicaragua - const PrepopulatedEngine* const engines_NI[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -586,7 +586,7 @@ const PrepopulatedEngine* const engines_NI[] = { - - // Netherlands - const PrepopulatedEngine* const engines_NL[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo_nl, - &duckduckgo, -@@ -594,7 +594,7 @@ const PrepopulatedEngine* const engines_NL[] = { - - // Norway - const PrepopulatedEngine* const engines_NO[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -602,7 +602,7 @@ const PrepopulatedEngine* const engines_NO[] = { - - // New Zealand - const PrepopulatedEngine* const engines_NZ[] = { -- &google, -+ &googleen, &google, - &bing, - &duckduckgo, - &yahoo_nz, -@@ -610,7 +610,7 @@ const PrepopulatedEngine* const engines_NZ[] = { - - // Oman - const PrepopulatedEngine* const engines_OM[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &ask, -@@ -618,7 +618,7 @@ const PrepopulatedEngine* const engines_OM[] = { - - // Panama - const PrepopulatedEngine* const engines_PA[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -626,7 +626,7 @@ const PrepopulatedEngine* const engines_PA[] = { - - // Peru - const PrepopulatedEngine* const engines_PE[] = { -- &google, -+ &googleen, &google, - &yahoo_pe, - &bing, - &duckduckgo, -@@ -634,7 +634,7 @@ const PrepopulatedEngine* const engines_PE[] = { - - // Philippines - const PrepopulatedEngine* const engines_PH[] = { -- &google, -+ &googleen, &google, - &yahoo_ph, - &bing, - &duckduckgo, -@@ -642,7 +642,7 @@ const PrepopulatedEngine* const engines_PH[] = { - - // Pakistan - const PrepopulatedEngine* const engines_PK[] = { -- &google, -+ &googleen, &google, - &yahoo, - &bing, - &baidu, -@@ -650,7 +650,7 @@ const PrepopulatedEngine* const engines_PK[] = { - - // Poland - const PrepopulatedEngine* const engines_PL[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -658,7 +658,7 @@ const PrepopulatedEngine* const engines_PL[] = { - - // Puerto Rico - const PrepopulatedEngine* const engines_PR[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -666,7 +666,7 @@ const PrepopulatedEngine* const engines_PR[] = { - - // Portugal - const PrepopulatedEngine* const engines_PT[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -674,7 +674,7 @@ const PrepopulatedEngine* const engines_PT[] = { - - // Paraguay - const PrepopulatedEngine* const engines_PY[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -682,7 +682,7 @@ const PrepopulatedEngine* const engines_PY[] = { - - // Qatar - const PrepopulatedEngine* const engines_QA[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &ask, -@@ -690,7 +690,7 @@ const PrepopulatedEngine* const engines_QA[] = { - - // Romania - const PrepopulatedEngine* const engines_RO[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -698,7 +698,7 @@ const PrepopulatedEngine* const engines_RO[] = { - - // Serbia - const PrepopulatedEngine* const engines_RS[] = { -- &google, -+ &googleen, &google, - &yahoo, - &bing, - &duckduckgo, -@@ -707,14 +707,14 @@ const PrepopulatedEngine* const engines_RS[] = { - // Russia - const PrepopulatedEngine* const engines_RU[] = { - &yandex_ru, -- &google, -+ &googleen, &google, - &mail_ru, - &bing, - }; - - // Rwanda - const PrepopulatedEngine* const engines_RW[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &yandex_ru, -@@ -722,7 +722,7 @@ const PrepopulatedEngine* const engines_RW[] = { - - // Saudi Arabia - const PrepopulatedEngine* const engines_SA[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &yandex_com, -@@ -730,7 +730,7 @@ const PrepopulatedEngine* const engines_SA[] = { - - // Sweden - const PrepopulatedEngine* const engines_SE[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo_se, - &duckduckgo, -@@ -738,7 +738,7 @@ const PrepopulatedEngine* const engines_SE[] = { - - // Singapore - const PrepopulatedEngine* const engines_SG[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo_sg, - &yandex_com, -@@ -746,7 +746,7 @@ const PrepopulatedEngine* const engines_SG[] = { - - // Slovenia - const PrepopulatedEngine* const engines_SI[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -754,7 +754,7 @@ const PrepopulatedEngine* const engines_SI[] = { - - // Slovakia - const PrepopulatedEngine* const engines_SK[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -762,7 +762,7 @@ const PrepopulatedEngine* const engines_SK[] = { - - // El Salvador - const PrepopulatedEngine* const engines_SV[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -770,7 +770,7 @@ const PrepopulatedEngine* const engines_SV[] = { - - // Syria - const PrepopulatedEngine* const engines_SY[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &yandex_ru, -@@ -778,7 +778,7 @@ const PrepopulatedEngine* const engines_SY[] = { - - // Thailand - const PrepopulatedEngine* const engines_TH[] = { -- &google, -+ &googleen, &google, - &yahoo_th, - &bing, - &ask, -@@ -786,7 +786,7 @@ const PrepopulatedEngine* const engines_TH[] = { - - // Tunisia - const PrepopulatedEngine* const engines_TN[] = { -- &google, -+ &googleen, &google, - &yahoo, - &bing, - &yandex_ru, -@@ -794,7 +794,7 @@ const PrepopulatedEngine* const engines_TN[] = { - - // Turkey - const PrepopulatedEngine* const engines_TR[] = { -- &google, -+ &googleen, &google, - &yandex_tr, - &yahoo_tr, - &bing, -@@ -802,7 +802,7 @@ const PrepopulatedEngine* const engines_TR[] = { - - // Trinidad and Tobago - const PrepopulatedEngine* const engines_TT[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -810,7 +810,7 @@ const PrepopulatedEngine* const engines_TT[] = { - - // Taiwan - const PrepopulatedEngine* const engines_TW[] = { -- &google, -+ &googleen, &google, - &yahoo_tw, - &bing, - &baidu, -@@ -818,7 +818,7 @@ const PrepopulatedEngine* const engines_TW[] = { - - // Tanzania - const PrepopulatedEngine* const engines_TZ[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &yandex_ru, -@@ -826,7 +826,7 @@ const PrepopulatedEngine* const engines_TZ[] = { - - // Ukraine - const PrepopulatedEngine* const engines_UA[] = { -- &google, -+ &googleen, &google, - &yandex_ua, - &mail_ru, - &bing, -@@ -834,7 +834,7 @@ const PrepopulatedEngine* const engines_UA[] = { - - // United States - const PrepopulatedEngine* const engines_US[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -842,7 +842,7 @@ const PrepopulatedEngine* const engines_US[] = { - - // Uruguay - const PrepopulatedEngine* const engines_UY[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -850,7 +850,7 @@ const PrepopulatedEngine* const engines_UY[] = { - - // Venezuela - const PrepopulatedEngine* const engines_VE[] = { -- &google, -+ &googleen, &google, - &yahoo_ve, - &bing, - &duckduckgo, -@@ -858,7 +858,7 @@ const PrepopulatedEngine* const engines_VE[] = { - - // Vietnam - const PrepopulatedEngine* const engines_VN[] = { -- &google, -+ &googleen, &google, - &coccoc, - &bing, - &yahoo_vn, -@@ -866,7 +866,7 @@ const PrepopulatedEngine* const engines_VN[] = { - - // Yemen - const PrepopulatedEngine* const engines_YE[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &baidu, -@@ -874,7 +874,7 @@ const PrepopulatedEngine* const engines_YE[] = { - - // South Africa - const PrepopulatedEngine* const engines_ZA[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &duckduckgo, -@@ -882,7 +882,7 @@ const PrepopulatedEngine* const engines_ZA[] = { - - // Zimbabwe - const PrepopulatedEngine* const engines_ZW[] = { -- &google, -+ &googleen, &google, - &bing, - &yahoo, - &baidu, --- -2.17.1 - diff --git a/build/patches/Add-Qwant-search-engine.patch b/build/patches/Add-Qwant-search-engine.patch deleted file mode 100644 index 2fa63b73..00000000 --- a/build/patches/Add-Qwant-search-engine.patch +++ /dev/null @@ -1,992 +0,0 @@ -From: csagan5 <32685696+csagan5@users.noreply.github.com> -Date: Mon, 12 Mar 2018 20:31:44 +0100 -Subject: Add Qwant search engine - -Specify image URL in upstream engine definition -Make search engine selectable in default list ---- - .../search_engines/prepopulated_engines.json | 1 + - .../template_url_prepopulate_data.cc | 216 +++++++++--------- - 2 files changed, 109 insertions(+), 108 deletions(-) - -diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json ---- a/components/search_engines/prepopulated_engines.json -+++ b/components/search_engines/prepopulated_engines.json -@@ -183,6 +183,7 @@ - "favicon_url": "https://www.qwant.com/favicon.ico", - "search_url": "https://www.qwant.com/?q={searchTerms}&client=opensearch", - "suggest_url": "https://api.qwant.com/api/suggest/?q={searchTerms}&client=opensearch", -+ "image_url": "https://www.qwant.com/?t=images&q={searchTerms}", - "type": "SEARCH_ENGINE_QWANT", - "id": 94 - }, -diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc ---- a/components/search_engines/template_url_prepopulate_data.cc -+++ b/components/search_engines/template_url_prepopulate_data.cc -@@ -32,7 +32,7 @@ namespace { - - // Default (for countries with no better engine set) - const PrepopulatedEngine* const engines_default[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -42,7 +42,7 @@ const PrepopulatedEngine* const engines_default[] = { - // Engine selection by country ------------------------------------------------ - // United Arab Emirates - const PrepopulatedEngine* const engines_AE[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -50,7 +50,7 @@ const PrepopulatedEngine* const engines_AE[] = { - - // Albania - const PrepopulatedEngine* const engines_AL[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &yahoo, - &bing, - &ask, -@@ -58,7 +58,7 @@ const PrepopulatedEngine* const engines_AL[] = { - - // Argentina - const PrepopulatedEngine* const engines_AR[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo_ar, - &duckduckgo, &duckduckgo_light, -@@ -66,7 +66,7 @@ const PrepopulatedEngine* const engines_AR[] = { - - // Austria - const PrepopulatedEngine* const engines_AT[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo_at, - &duckduckgo, &duckduckgo_light, -@@ -74,7 +74,7 @@ const PrepopulatedEngine* const engines_AT[] = { - - // Australia - const PrepopulatedEngine* const engines_AU[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo_au, - &duckduckgo, &duckduckgo_light, -@@ -82,7 +82,7 @@ const PrepopulatedEngine* const engines_AU[] = { - - // Bosnia and Herzegovina - const PrepopulatedEngine* const engines_BA[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &yahoo, - &bing, - &ask, -@@ -90,7 +90,7 @@ const PrepopulatedEngine* const engines_BA[] = { - - // Belgium - const PrepopulatedEngine* const engines_BE[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -98,7 +98,7 @@ const PrepopulatedEngine* const engines_BE[] = { - - // Bulgaria - const PrepopulatedEngine* const engines_BG[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &yandex_ru, -@@ -106,7 +106,7 @@ const PrepopulatedEngine* const engines_BG[] = { - - // Bahrain - const PrepopulatedEngine* const engines_BH[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &ask, -@@ -114,7 +114,7 @@ const PrepopulatedEngine* const engines_BH[] = { - - // Burundi - const PrepopulatedEngine* const engines_BI[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &yandex_ru, -@@ -122,7 +122,7 @@ const PrepopulatedEngine* const engines_BI[] = { - - // Brunei - const PrepopulatedEngine* const engines_BN[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -130,7 +130,7 @@ const PrepopulatedEngine* const engines_BN[] = { - - // Bolivia - const PrepopulatedEngine* const engines_BO[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -138,7 +138,7 @@ const PrepopulatedEngine* const engines_BO[] = { - - // Brazil - const PrepopulatedEngine* const engines_BR[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo_br, - &duckduckgo, &duckduckgo_light, -@@ -146,7 +146,7 @@ const PrepopulatedEngine* const engines_BR[] = { - - // Belarus - const PrepopulatedEngine* const engines_BY[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &yandex_by, - &mail_ru, - &bing, -@@ -154,7 +154,7 @@ const PrepopulatedEngine* const engines_BY[] = { - - // Belize - const PrepopulatedEngine* const engines_BZ[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, -@@ -163,12 +163,12 @@ const PrepopulatedEngine* const engines_BZ[] = { - - // Canada - const PrepopulatedEngine* const engines_CA[] = { -- &googleen, &google, &bing, &yahoo_ca, &yahoo_qc, &duckduckgo, &duckduckgo_light, -+ &googleen, &google, &qwant, &bing, &yahoo_ca, &yahoo_qc, &duckduckgo, &duckduckgo_light, - }; - - // Switzerland - const PrepopulatedEngine* const engines_CH[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &duckduckgo, - &duckduckgo_light, -@@ -177,7 +177,7 @@ const PrepopulatedEngine* const engines_CH[] = { - - // Chile - const PrepopulatedEngine* const engines_CL[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo_cl, - &duckduckgo, &duckduckgo_light, -@@ -185,12 +185,12 @@ const PrepopulatedEngine* const engines_CL[] = { - - // China - const PrepopulatedEngine* const engines_CN[] = { -- &baidu, &so_360, &googleen, &google, &sogou, &bing, -+ &baidu, &so_360, &googleen, &google, &qwant, &sogou, &bing, - }; - - // Colombia - const PrepopulatedEngine* const engines_CO[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &yahoo_co, - &bing, - &duckduckgo, &duckduckgo_light, -@@ -198,7 +198,7 @@ const PrepopulatedEngine* const engines_CO[] = { - - // Costa Rica - const PrepopulatedEngine* const engines_CR[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -206,7 +206,7 @@ const PrepopulatedEngine* const engines_CR[] = { - - // Czech Republic - const PrepopulatedEngine* const engines_CZ[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &seznam_cz, - &bing, - &yahoo, -@@ -214,7 +214,7 @@ const PrepopulatedEngine* const engines_CZ[] = { - - // Germany - const PrepopulatedEngine* const engines_DE[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo_de, - &duckduckgo, &duckduckgo_light, -@@ -222,7 +222,7 @@ const PrepopulatedEngine* const engines_DE[] = { - - // Denmark - const PrepopulatedEngine* const engines_DK[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo_dk, - &duckduckgo, &duckduckgo_light, -@@ -230,7 +230,7 @@ const PrepopulatedEngine* const engines_DK[] = { - - // Dominican Republic - const PrepopulatedEngine* const engines_DO[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -238,7 +238,7 @@ const PrepopulatedEngine* const engines_DO[] = { - - // Algeria - const PrepopulatedEngine* const engines_DZ[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &yahoo, - &bing, - &yandex_ru, -@@ -246,7 +246,7 @@ const PrepopulatedEngine* const engines_DZ[] = { - - // Ecuador - const PrepopulatedEngine* const engines_EC[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -254,7 +254,7 @@ const PrepopulatedEngine* const engines_EC[] = { - - // Estonia - const PrepopulatedEngine* const engines_EE[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yandex_ru, - &neti, -@@ -262,7 +262,7 @@ const PrepopulatedEngine* const engines_EE[] = { - - // Egypt - const PrepopulatedEngine* const engines_EG[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &yahoo, - &bing, - &yandex_ru, -@@ -270,7 +270,7 @@ const PrepopulatedEngine* const engines_EG[] = { - - // Spain - const PrepopulatedEngine* const engines_ES[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo_es, - &duckduckgo, &duckduckgo_light, -@@ -278,7 +278,7 @@ const PrepopulatedEngine* const engines_ES[] = { - - // Finland - const PrepopulatedEngine* const engines_FI[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo_fi, - &duckduckgo, &duckduckgo_light, -@@ -286,7 +286,7 @@ const PrepopulatedEngine* const engines_FI[] = { - - // Faroe Islands - const PrepopulatedEngine* const engines_FO[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -294,7 +294,7 @@ const PrepopulatedEngine* const engines_FO[] = { - - // France - const PrepopulatedEngine* const engines_FR[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo_fr, - &qwant, -@@ -302,7 +302,7 @@ const PrepopulatedEngine* const engines_FR[] = { - - // United Kingdom - const PrepopulatedEngine* const engines_GB[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo_uk, - &duckduckgo, &duckduckgo_light, -@@ -310,7 +310,7 @@ const PrepopulatedEngine* const engines_GB[] = { - - // Greece - const PrepopulatedEngine* const engines_GR[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -318,7 +318,7 @@ const PrepopulatedEngine* const engines_GR[] = { - - // Guatemala - const PrepopulatedEngine* const engines_GT[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -326,7 +326,7 @@ const PrepopulatedEngine* const engines_GT[] = { - - // Hong Kong - const PrepopulatedEngine* const engines_HK[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &yahoo_hk, - &bing, - &baidu, -@@ -334,7 +334,7 @@ const PrepopulatedEngine* const engines_HK[] = { - - // Honduras - const PrepopulatedEngine* const engines_HN[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -342,7 +342,7 @@ const PrepopulatedEngine* const engines_HN[] = { - - // Croatia - const PrepopulatedEngine* const engines_HR[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -350,7 +350,7 @@ const PrepopulatedEngine* const engines_HR[] = { - - // Hungary - const PrepopulatedEngine* const engines_HU[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &yahoo, - &bing, - &duckduckgo, &duckduckgo_light, -@@ -358,7 +358,7 @@ const PrepopulatedEngine* const engines_HU[] = { - - // Indonesia - const PrepopulatedEngine* const engines_ID[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &yahoo_id, - &bing, - &duckduckgo, &duckduckgo_light, -@@ -366,7 +366,7 @@ const PrepopulatedEngine* const engines_ID[] = { - - // Ireland - const PrepopulatedEngine* const engines_IE[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -374,7 +374,7 @@ const PrepopulatedEngine* const engines_IE[] = { - - // Israel - const PrepopulatedEngine* const engines_IL[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &yandex_ru, -@@ -382,7 +382,7 @@ const PrepopulatedEngine* const engines_IL[] = { - - // India - const PrepopulatedEngine* const engines_IN[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &yahoo_in, - &bing, - &duckduckgo, &duckduckgo_light, -@@ -390,7 +390,7 @@ const PrepopulatedEngine* const engines_IN[] = { - - // Iraq - const PrepopulatedEngine* const engines_IQ[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &yahoo, - &bing, - &yandex_ru, -@@ -398,14 +398,14 @@ const PrepopulatedEngine* const engines_IQ[] = { - - // Iran - const PrepopulatedEngine* const engines_IR[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - }; - - // Iceland - const PrepopulatedEngine* const engines_IS[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -413,7 +413,7 @@ const PrepopulatedEngine* const engines_IS[] = { - - // Italy - const PrepopulatedEngine* const engines_IT[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -421,7 +421,7 @@ const PrepopulatedEngine* const engines_IT[] = { - - // Jamaica - const PrepopulatedEngine* const engines_JM[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -429,7 +429,7 @@ const PrepopulatedEngine* const engines_JM[] = { - - // Jordan - const PrepopulatedEngine* const engines_JO[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &yahoo, - &bing, - &yandex_ru, -@@ -437,7 +437,7 @@ const PrepopulatedEngine* const engines_JO[] = { - - // Japan - const PrepopulatedEngine* const engines_JP[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &yahoo_jp, - &bing, - &baidu, -@@ -445,7 +445,7 @@ const PrepopulatedEngine* const engines_JP[] = { - - // Kenya - const PrepopulatedEngine* const engines_KE[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &yahoo, - &bing, - &duckduckgo, &duckduckgo_light, -@@ -453,7 +453,7 @@ const PrepopulatedEngine* const engines_KE[] = { - - // South Korea - const PrepopulatedEngine* const engines_KR[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &naver, - &daum, - &bing, -@@ -461,7 +461,7 @@ const PrepopulatedEngine* const engines_KR[] = { - - // Kuwait - const PrepopulatedEngine* const engines_KW[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &ask, -@@ -469,7 +469,7 @@ const PrepopulatedEngine* const engines_KW[] = { - - // Kazakhstan - const PrepopulatedEngine* const engines_KZ[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &yandex_kz, - &mail_ru, - &bing, -@@ -477,7 +477,7 @@ const PrepopulatedEngine* const engines_KZ[] = { - - // Lebanon - const PrepopulatedEngine* const engines_LB[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, -@@ -486,7 +486,7 @@ const PrepopulatedEngine* const engines_LB[] = { - - // Liechtenstein - const PrepopulatedEngine* const engines_LI[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &duckduckgo, - &duckduckgo_light, -@@ -495,7 +495,7 @@ const PrepopulatedEngine* const engines_LI[] = { - - // Lithuania - const PrepopulatedEngine* const engines_LT[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &yandex_ru, -@@ -503,7 +503,7 @@ const PrepopulatedEngine* const engines_LT[] = { - - // Luxembourg - const PrepopulatedEngine* const engines_LU[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &duckduckgo, &duckduckgo_light, - &yahoo, -@@ -511,7 +511,7 @@ const PrepopulatedEngine* const engines_LU[] = { - - // Latvia - const PrepopulatedEngine* const engines_LV[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yandex_ru, - &yahoo, -@@ -519,7 +519,7 @@ const PrepopulatedEngine* const engines_LV[] = { - - // Libya - const PrepopulatedEngine* const engines_LY[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &yahoo, - &bing, - &yandex_com, -@@ -527,7 +527,7 @@ const PrepopulatedEngine* const engines_LY[] = { - - // Morocco - const PrepopulatedEngine* const engines_MA[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &yahoo, - &bing, - &yandex_ru, -@@ -535,7 +535,7 @@ const PrepopulatedEngine* const engines_MA[] = { - - // Monaco - const PrepopulatedEngine* const engines_MC[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -543,7 +543,7 @@ const PrepopulatedEngine* const engines_MC[] = { - - // Moldova - const PrepopulatedEngine* const engines_MD[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &yandex_ru, - &mail_ru, - &duckduckgo, &duckduckgo_light, -@@ -551,7 +551,7 @@ const PrepopulatedEngine* const engines_MD[] = { - - // Montenegro - const PrepopulatedEngine* const engines_ME[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &yahoo, - &bing, - &yandex_ru, -@@ -559,7 +559,7 @@ const PrepopulatedEngine* const engines_ME[] = { - - // Macedonia - const PrepopulatedEngine* const engines_MK[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &yahoo, - &bing, - &duckduckgo, &duckduckgo_light, -@@ -567,7 +567,7 @@ const PrepopulatedEngine* const engines_MK[] = { - - // Mexico - const PrepopulatedEngine* const engines_MX[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo_mx, - &duckduckgo, &duckduckgo_light, -@@ -575,7 +575,7 @@ const PrepopulatedEngine* const engines_MX[] = { - - // Malaysia - const PrepopulatedEngine* const engines_MY[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &yahoo_my, - &bing, - &baidu, -@@ -583,7 +583,7 @@ const PrepopulatedEngine* const engines_MY[] = { - - // Nicaragua - const PrepopulatedEngine* const engines_NI[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -591,7 +591,7 @@ const PrepopulatedEngine* const engines_NI[] = { - - // Netherlands - const PrepopulatedEngine* const engines_NL[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo_nl, - &duckduckgo, &duckduckgo_light, -@@ -599,7 +599,7 @@ const PrepopulatedEngine* const engines_NL[] = { - - // Norway - const PrepopulatedEngine* const engines_NO[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, -@@ -608,7 +608,7 @@ const PrepopulatedEngine* const engines_NO[] = { - - // New Zealand - const PrepopulatedEngine* const engines_NZ[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &duckduckgo, &duckduckgo_light, - &yahoo_nz, -@@ -616,7 +616,7 @@ const PrepopulatedEngine* const engines_NZ[] = { - - // Oman - const PrepopulatedEngine* const engines_OM[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &ask, -@@ -624,7 +624,7 @@ const PrepopulatedEngine* const engines_OM[] = { - - // Panama - const PrepopulatedEngine* const engines_PA[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -632,7 +632,7 @@ const PrepopulatedEngine* const engines_PA[] = { - - // Peru - const PrepopulatedEngine* const engines_PE[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &yahoo_pe, - &bing, - &duckduckgo, &duckduckgo_light, -@@ -640,7 +640,7 @@ const PrepopulatedEngine* const engines_PE[] = { - - // Philippines - const PrepopulatedEngine* const engines_PH[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &yahoo_ph, - &bing, - &duckduckgo, &duckduckgo_light, -@@ -648,7 +648,7 @@ const PrepopulatedEngine* const engines_PH[] = { - - // Pakistan - const PrepopulatedEngine* const engines_PK[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &yahoo, - &bing, - &baidu, -@@ -656,7 +656,7 @@ const PrepopulatedEngine* const engines_PK[] = { - - // Poland - const PrepopulatedEngine* const engines_PL[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -664,7 +664,7 @@ const PrepopulatedEngine* const engines_PL[] = { - - // Puerto Rico - const PrepopulatedEngine* const engines_PR[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -672,7 +672,7 @@ const PrepopulatedEngine* const engines_PR[] = { - - // Portugal - const PrepopulatedEngine* const engines_PT[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -680,7 +680,7 @@ const PrepopulatedEngine* const engines_PT[] = { - - // Paraguay - const PrepopulatedEngine* const engines_PY[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -688,7 +688,7 @@ const PrepopulatedEngine* const engines_PY[] = { - - // Qatar - const PrepopulatedEngine* const engines_QA[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &ask, -@@ -696,7 +696,7 @@ const PrepopulatedEngine* const engines_QA[] = { - - // Romania - const PrepopulatedEngine* const engines_RO[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -704,7 +704,7 @@ const PrepopulatedEngine* const engines_RO[] = { - - // Serbia - const PrepopulatedEngine* const engines_RS[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &yahoo, - &bing, - &duckduckgo, &duckduckgo_light, -@@ -713,14 +713,14 @@ const PrepopulatedEngine* const engines_RS[] = { - // Russia - const PrepopulatedEngine* const engines_RU[] = { - &yandex_ru, -- &googleen, &google, -+ &googleen, &google, &qwant, - &mail_ru, - &bing, - }; - - // Rwanda - const PrepopulatedEngine* const engines_RW[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &yandex_ru, -@@ -728,7 +728,7 @@ const PrepopulatedEngine* const engines_RW[] = { - - // Saudi Arabia - const PrepopulatedEngine* const engines_SA[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &yandex_com, -@@ -736,7 +736,7 @@ const PrepopulatedEngine* const engines_SA[] = { - - // Sweden - const PrepopulatedEngine* const engines_SE[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo_se, - &duckduckgo, &duckduckgo_light, -@@ -744,7 +744,7 @@ const PrepopulatedEngine* const engines_SE[] = { - - // Singapore - const PrepopulatedEngine* const engines_SG[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo_sg, - &yandex_com, -@@ -752,7 +752,7 @@ const PrepopulatedEngine* const engines_SG[] = { - - // Slovenia - const PrepopulatedEngine* const engines_SI[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -760,7 +760,7 @@ const PrepopulatedEngine* const engines_SI[] = { - - // Slovakia - const PrepopulatedEngine* const engines_SK[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -768,7 +768,7 @@ const PrepopulatedEngine* const engines_SK[] = { - - // El Salvador - const PrepopulatedEngine* const engines_SV[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -776,7 +776,7 @@ const PrepopulatedEngine* const engines_SV[] = { - - // Syria - const PrepopulatedEngine* const engines_SY[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &yandex_ru, -@@ -784,7 +784,7 @@ const PrepopulatedEngine* const engines_SY[] = { - - // Thailand - const PrepopulatedEngine* const engines_TH[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &yahoo_th, - &bing, - &ask, -@@ -792,7 +792,7 @@ const PrepopulatedEngine* const engines_TH[] = { - - // Tunisia - const PrepopulatedEngine* const engines_TN[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &yahoo, - &bing, - &yandex_ru, -@@ -800,7 +800,7 @@ const PrepopulatedEngine* const engines_TN[] = { - - // Turkey - const PrepopulatedEngine* const engines_TR[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &yandex_tr, - &yahoo_tr, - &bing, -@@ -808,7 +808,7 @@ const PrepopulatedEngine* const engines_TR[] = { - - // Trinidad and Tobago - const PrepopulatedEngine* const engines_TT[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -816,7 +816,7 @@ const PrepopulatedEngine* const engines_TT[] = { - - // Taiwan - const PrepopulatedEngine* const engines_TW[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &yahoo_tw, - &bing, - &baidu, -@@ -824,7 +824,7 @@ const PrepopulatedEngine* const engines_TW[] = { - - // Tanzania - const PrepopulatedEngine* const engines_TZ[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &yandex_ru, -@@ -832,7 +832,7 @@ const PrepopulatedEngine* const engines_TZ[] = { - - // Ukraine - const PrepopulatedEngine* const engines_UA[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &yandex_ua, - &mail_ru, - &bing, -@@ -840,7 +840,7 @@ const PrepopulatedEngine* const engines_UA[] = { - - // United States - const PrepopulatedEngine* const engines_US[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -848,7 +848,7 @@ const PrepopulatedEngine* const engines_US[] = { - - // Uruguay - const PrepopulatedEngine* const engines_UY[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -856,7 +856,7 @@ const PrepopulatedEngine* const engines_UY[] = { - - // Venezuela - const PrepopulatedEngine* const engines_VE[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &yahoo_ve, - &bing, - &duckduckgo, &duckduckgo_light, -@@ -864,7 +864,7 @@ const PrepopulatedEngine* const engines_VE[] = { - - // Vietnam - const PrepopulatedEngine* const engines_VN[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &coccoc, - &bing, - &yahoo_vn, -@@ -872,7 +872,7 @@ const PrepopulatedEngine* const engines_VN[] = { - - // Yemen - const PrepopulatedEngine* const engines_YE[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &baidu, -@@ -880,7 +880,7 @@ const PrepopulatedEngine* const engines_YE[] = { - - // South Africa - const PrepopulatedEngine* const engines_ZA[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &duckduckgo, &duckduckgo_light, -@@ -888,7 +888,7 @@ const PrepopulatedEngine* const engines_ZA[] = { - - // Zimbabwe - const PrepopulatedEngine* const engines_ZW[] = { -- &googleen, &google, -+ &googleen, &google, &qwant, - &bing, - &yahoo, - &baidu, --- -2.17.1 - diff --git a/build/patches/e-set-search-engines.patch b/build/patches/e-set-search-engines.patch index 55eb2d50..6b6544d6 100644 --- a/build/patches/e-set-search-engines.patch +++ b/build/patches/e-set-search-engines.patch @@ -1,17 +1,17 @@ -From bb53448e40d144e4bafd1c8a521257639185378a Mon Sep 17 00:00:00 2001 +From 21fc92291ac00448461476bc1b7241e249cfe562 Mon Sep 17 00:00:00 2001 From: Romain HUNAULT -Date: Mon, 20 Jan 2020 17:24:51 +0530 -Subject: [PATCH] [PATCH 1/7] Set search engine +Date: Tue, 28 Jan 2020 02:15:15 +0530 +Subject: [PATCH] [1/7] Set search engine --- - .../chrome/browser/locale/LocaleManager.java | 1 - - .../locale/LocaleTemplateUrlLoader.java | 9 - - .../locale/locale_template_url_loader.cc | 35 +- - .../locale/locale_template_url_loader.h | 1 - - .../search_engines/prepopulated_engines.json | 989 +----------------- - .../search_engines/search_engine_type.h | 3 +- - .../template_url_prepopulate_data.cc | 550 ++-------- - 7 files changed, 124 insertions(+), 1464 deletions(-) + .../chrome/browser/locale/LocaleManager.java | 1 - + .../locale/LocaleTemplateUrlLoader.java | 9 - + .../locale/locale_template_url_loader.cc | 35 +- + .../locale/locale_template_url_loader.h | 1 - + .../search_engines/prepopulated_engines.json | 1101 +---------------- + .../search_engines/search_engine_type.h | 3 +- + .../template_url_prepopulate_data.cc | 545 ++------ + 7 files changed, 132 insertions(+), 1563 deletions(-) diff --git a/chrome/android/java/src/org/chromium/chrome/browser/locale/LocaleManager.java b/chrome/android/java/src/org/chromium/chrome/browser/locale/LocaleManager.java index 56148b0b5b78..879019952f1e 100644 @@ -130,10 +130,10 @@ index 5e5591cbf4a6..b662955807a2 100644 virtual ~LocaleTemplateUrlLoader(); diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json -index e538ad5a215f..32cc3371d785 100644 +index d4679b35bdc5..77c92706afac 100644 --- a/components/search_engines/prepopulated_engines.json +++ b/components/search_engines/prepopulated_engines.json -@@ -34,63 +34,6 @@ +@@ -34,62 +34,15 @@ // The following engines are included in country lists and are added to the // list of search engines on the first run depending on user's country. "elements": { @@ -193,20 +193,19 @@ index e538ad5a215f..32cc3371d785 100644 - "type": "SEARCH_ENGINE_DAUM", - "id": 68 - }, -- - "duckduckgo_light": { - "name": "DuckDuckGo Light", - "keyword": "duckduckgo.com/lite", -@@ -98,7 +41,7 @@ - "search_url": "https://duckduckgo.com/lite/?q={searchTerms}", - "suggest_url": "https://duckduckgo.com/ac/?q={searchTerms}&type=list", - "type": "SEARCH_ENGINE_DUCKDUCKGOLIGHT", -- "id": 12 -+ "id": 2 - }, ++ "duckduckgo_light": { ++ "name": "DuckDuckGo Light", ++ "keyword": "duckduckgo.com/lite", ++ "favicon_url": "https://duckduckgo.com/favicon.ico", ++ "search_url": "https://duckduckgo.com/lite/?q={searchTerms}", ++ "suggest_url": "https://duckduckgo.com/ac/?q={searchTerms}&type=list", ++ "type": "SEARCH_ENGINE_DUCKDUCKGOLIGHT", ++ "id": 2 ++ }, "duckduckgo": { -@@ -109,74 +52,9 @@ + "name": "DuckDuckGo", +@@ -99,53 +52,9 @@ "suggest_url": "https://duckduckgo.com/ac/?q={searchTerms}&type=list", "new_tab_url": "https://duckduckgo.com/chrome_newtab", "type": "SEARCH_ENGINE_DUCKDUCKGO", @@ -233,27 +232,6 @@ index e538ad5a215f..32cc3371d785 100644 "id": 1 }, -- "googleen": { -- "name": "Google in English", -- "keyword": "googleen", -- "favicon_url": "https://www.google.com/favicon.ico", -- "search_url": "{google:baseURL}search?q={searchTerms}&{google:originalQueryForSuggestion}{google:iOSSearchLanguage}{google:searchClient}{google:contextualSearchVersion}ie={inputEncoding}&hl=en", -- "suggest_url": "{google:baseSuggestURL}search?client={google:suggestClient}&gs_ri={google:suggestRid}&xssi=t&q={searchTerms}&{google:inputType}{google:pageClassification}{google:searchVersion}{google:prefetchQuery}sugkey={google:suggestAPIKeyParameter}&hl=en", -- "image_url": "{google:baseURL}searchbyimage/upload?hl=en", -- "new_tab_url": "{google:baseURL}_/chrome/newtab?hl=en&ie={inputEncoding}", -- "contextual_search_url": "{google:baseURL}_/contextualsearch?{google:contextualSearchVersion}{google:contextualSearchContextData}&hl=en", -- "image_url_post_params": "encoded_image={google:imageThumbnail},image_url={google:imageURL},sbisrc={google:imageSearchSource},original_width={google:imageOriginalWidth},original_height={google:imageOriginalHeight}", -- "alternate_urls": [ -- "{google:baseURL}?hl=en#q={searchTerms}", -- "{google:baseURL}search?hl=en#q={searchTerms}", -- "{google:baseURL}webhp?hl=en#q={searchTerms}", -- "{google:baseURL}s?hl=en#q={searchTerms}", -- "{google:baseURL}s?hl=en&q={searchTerms}" -- ], -- "type": "SEARCH_ENGINE_GOOGLE_EN", -- "id": 13 -- }, -- - "mail_ru": { - "name": "@MAIL.RU", - "keyword": "mail.ru", @@ -281,19 +259,29 @@ index e538ad5a215f..32cc3371d785 100644 "qwant": { "name": "Qwant", "keyword": "qwant.com", -@@ -185,863 +63,18 @@ +@@ -153,990 +62,18 @@ + "search_url": "https://www.qwant.com/?q={searchTerms}&client=opensearch", "suggest_url": "https://api.qwant.com/api/suggest/?q={searchTerms}&client=opensearch", - "image_url": "https://www.qwant.com/?t=images&q={searchTerms}", "type": "SEARCH_ENGINE_QWANT", - "id": 94 - }, - -- "seznam": { +- "seznam_cz": { - "name": "Seznam", - "keyword": "seznam.cz", -- "favicon_url": "https://search.seznam.cz/r/img/favicon.ico", +- "favicon_url": "https://search.seznam.cz/favicon.ico", - "search_url": "https://search.seznam.cz/?q={searchTerms}", -- "suggest_url": "https://suggest.fulltext.seznam.cz/fulltext_ff?phrase={searchTerms}", +- "suggest_url": "https://suggest.seznam.cz/fulltext_ff?phrase={searchTerms}", +- "type": "SEARCH_ENGINE_SEZNAM", +- "id": 25 +- }, +- +- "seznam_sk": { +- "name": "Seznam", +- "keyword": "seznam.sk", +- "favicon_url": "https://search.seznam.sk/favicon.ico", +- "search_url": "https://search.seznam.sk/?q={searchTerms}", +- "suggest_url": "https://suggest.seznam.sk/fulltext_ff?phrase={searchTerms}", - "type": "SEARCH_ENGINE_SEZNAM", - "id": 25 - }, @@ -864,6 +852,76 @@ index e538ad5a215f..32cc3371d785 100644 - "id": 60 - }, - +- "givero": { +- "name": "Givero", +- "keyword": "givero.com", +- "favicon_url": "https://www.givero.com/favicon.ico", +- "search_url": "https://www.givero.com/search?q={searchTerms}", +- "suggest_url": "https://www.givero.com/suggest?q={searchTerms}", +- "type": "SEARCH_ENGINE_GIVERO", +- "id": 95 +- }, +- +- "gmx": { +- "name": "GMX Search", +- "keyword": "search.gmx.com", +- "favicon_url": "https://dl.gmx.com/apps/favicon.ico", +- "search_url": "https://search.gmx.com/web/result?q={searchTerms}&sp=b", +- "suggest_url": "https://suggestplugin.gmx.com/s?q={searchTerms}&brand=gmxcom&enc={inputEncoding}&sp=b", +- "type": "SEARCH_ENGINE_GMX", +- "id": 96 +- }, +- +- "gmx_at": { +- "name": "GMX Suche", +- "keyword": "suche.gmx.at", +- "favicon_url": "https://dl.gmx.com/apps/favicon.ico", +- "search_url": "https://suche.gmx.at/web/result?q={searchTerms}&sp=b", +- "suggest_url": "https://suggestplugin.gmx.at/s?q={searchTerms}&brand=gmxat&enc={inputEncoding}&sp=b", +- "type": "SEARCH_ENGINE_GMX", +- "id": 96 +- }, +- +- "gmx_de": { +- "name": "GMX Suche", +- "keyword": "suche.gmx.net", +- "favicon_url": "https://dl.gmx.com/apps/favicon.ico", +- "search_url": "https://suche.gmx.net/web/result?q={searchTerms}&sp=b", +- "suggest_url": "https://suggestplugin.gmx.net/s?q={searchTerms}&brand=gmx&enc={inputEncoding}&sp=b", +- "type": "SEARCH_ENGINE_GMX", +- "id": 96 +- }, +- +- "gmx_es": { +- "name": "GMX Search", +- "keyword": "search.gmx.es", +- "favicon_url": "https://dl.gmx.com/apps/favicon.ico", +- "search_url": "https://search.gmx.es/web/result?q={searchTerms}&sp=b", +- "suggest_url": "https://suggestplugin.gmx.es/s?q={searchTerms}&brand=gmxes&enc={inputEncoding}&sp=b", +- "type": "SEARCH_ENGINE_GMX", +- "id": 96 +- }, +- +- "gmx_fr": { +- "name": "GMX Search", +- "keyword": "search.gmx.fr", +- "favicon_url": "https://dl.gmx.com/apps/favicon.ico", +- "search_url": "https://search.gmx.fr/web/result?q={searchTerms}&sp=b", +- "suggest_url": "https://suggestplugin.gmx.fr/s?q={searchTerms}&brand=gmxfr&enc={inputEncoding}&sp=b", +- "type": "SEARCH_ENGINE_GMX", +- "id": 96 +- }, +- +- "gmx_gb": { +- "name": "GMX Search", +- "keyword": "search.gmx.co.uk", +- "favicon_url": "https://dl.gmx.com/apps/favicon.ico", +- "search_url": "https://search.gmx.co.uk/web/result?q={searchTerms}&sp=b", +- "suggest_url": "https://suggestplugin.gmx.co.uk/s?q={searchTerms}&brand=gmxcouk&enc={inputEncoding}&sp=b", +- "type": "SEARCH_ENGINE_GMX", +- "id": 96 +- }, +- - "goo": { - "name": "goo", - "keyword": "search.goo.ne.jp", @@ -925,6 +983,15 @@ index e538ad5a215f..32cc3371d785 100644 - "id": 74 - }, - +- "info_com": { +- "name": "Info.com", +- "keyword": "info.com", +- "favicon_url": "https://www.info.com/static/www.info.com/favicon.ico", +- "search_url": "https://www.info.com/serp?q={searchTerms}&segment=info.0472", +- "type": "SEARCH_ENGINE_INFO_COM", +- "id": 97 +- }, +- - "libero": { - "name": "Libero", - "keyword": "libero.it", @@ -935,6 +1002,24 @@ index e538ad5a215f..32cc3371d785 100644 - "id": 63 - }, - +- "metager_de": { +- "name": "MetaGer", +- "keyword": "metager.de", +- "favicon_url": "https://metager.de/favicon.ico", +- "search_url": "https://metager.de/meta/meta.ger3?eingabe={searchTerms}", +- "type": "SEARCH_ENGINE_METAGER", +- "id": 98 +- }, +- +- "metager_gb": { +- "name": "MetaGer", +- "keyword": "metager.org", +- "favicon_url": "https://metager.de/favicon.ico", +- "search_url": "https://metager.org/meta/meta.ger3?eingabe={searchTerms}", +- "type": "SEARCH_ENGINE_METAGER", +- "id": 98 +- }, +- - "neti": { - "name": "NETI", - "keyword": "neti.ee", @@ -960,6 +1045,16 @@ index e538ad5a215f..32cc3371d785 100644 - "id": 43 - }, - +- "oceanhero":{ +- "name": "OceanHero", +- "keyword": "oceanhero.today", +- "favicon_url": "https://oceanhero.today/favicon.ico", +- "search_url": "https://oceanhero.today/web?q={searchTerms}", +- "suggest_url": "https://api.oceanhero.today/suggestions?q={searchTerms}", +- "type": "SEARCH_ENGINE_OCEANHERO", +- "id": 99 +- }, +- - "ok": { - "name": "OK.hu", - "keyword": "ok.hu", @@ -970,6 +1065,16 @@ index e538ad5a215f..32cc3371d785 100644 - "id": 6 - }, - +- "privacywall": { +- "name": "PrivacyWall", +- "keyword": "privacywall.org", +- "favicon_url": "https://www.privacywall.org/images/favicon32.ico", +- "search_url": "https://www.privacywall.org/search/secure/?q={searchTerms}", +- "suggest_url": "https://www.privacywall.org/search/suggest.php?q={searchTerms}", +- "type": "SEARCH_ENGINE_PRIVACYWALL", +- "id": 100 +- }, +- - "rambler": { - "name": "\u0420\u0430\u043c\u0431\u043b\u0435\u0440", - "keyword": "rambler.ru", @@ -1156,13 +1261,13 @@ index e538ad5a215f..32cc3371d785 100644 "generate_array": { diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h -index 10cbd9f1de3b..2189bfaae7a2 100644 +index ff303b8f3044..355569fa52fd 100644 --- a/components/search_engines/search_engine_type.h +++ b/components/search_engines/search_engine_type.h -@@ -70,7 +70,8 @@ enum SearchEngineType { - SEARCH_ENGINE_QWANT, +@@ -74,7 +74,8 @@ enum SearchEngineType { + SEARCH_ENGINE_OCEANHERO, + SEARCH_ENGINE_PRIVACYWALL, - SEARCH_ENGINE_GOOGLE_EN, - SEARCH_ENGINE_MAX // Bounding value needed for UMA histogram macro. + SEARCH_ENGINE_MAX, // Bounding value needed for UMA histogram macro. + SEARCH_ENGINE_ESPOT @@ -1170,17 +1275,16 @@ index 10cbd9f1de3b..2189bfaae7a2 100644 #endif // COMPONENTS_SEARCH_ENGINES_SEARCH_ENGINE_TYPE_H_ diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc -index f3a41866f1df..668e496b047d 100644 +index afd8d81a177b..09bd7b8842fe 100644 --- a/components/search_engines/template_url_prepopulate_data.cc +++ b/components/search_engines/template_url_prepopulate_data.cc -@@ -32,866 +32,544 @@ namespace { +@@ -32,860 +32,543 @@ namespace { // Default (for countries with no better engine set) const PrepopulatedEngine* const engines_default[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; @@ -1188,16 +1292,16 @@ index f3a41866f1df..668e496b047d 100644 // Engine selection by country ------------------------------------------------ // United Arab Emirates const PrepopulatedEngine* const engines_AE[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Albania const PrepopulatedEngine* const engines_AL[] = { -- &googleen, &google, &qwant, +- &google, - &yahoo, - &bing, - &ask, @@ -1206,34 +1310,34 @@ index f3a41866f1df..668e496b047d 100644 // Argentina const PrepopulatedEngine* const engines_AR[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo_ar, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Austria const PrepopulatedEngine* const engines_AT[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo_at, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Australia const PrepopulatedEngine* const engines_AU[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo_au, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Bosnia and Herzegovina const PrepopulatedEngine* const engines_BA[] = { -- &googleen, &google, &qwant, +- &google, - &yahoo, - &bing, - &ask, @@ -1242,16 +1346,16 @@ index f3a41866f1df..668e496b047d 100644 // Belgium const PrepopulatedEngine* const engines_BE[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Bulgaria const PrepopulatedEngine* const engines_BG[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, - &yandex_ru, @@ -1260,7 +1364,7 @@ index f3a41866f1df..668e496b047d 100644 // Bahrain const PrepopulatedEngine* const engines_BH[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, - &ask, @@ -1269,7 +1373,7 @@ index f3a41866f1df..668e496b047d 100644 // Burundi const PrepopulatedEngine* const engines_BI[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, - &yandex_ru, @@ -1278,34 +1382,34 @@ index f3a41866f1df..668e496b047d 100644 // Brunei const PrepopulatedEngine* const engines_BN[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Bolivia const PrepopulatedEngine* const engines_BO[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Brazil const PrepopulatedEngine* const engines_BR[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo_br, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Belarus const PrepopulatedEngine* const engines_BY[] = { -- &googleen, &google, &qwant, +- &google, - &yandex_by, - &mail_ru, - &bing, @@ -1314,67 +1418,65 @@ index f3a41866f1df..668e496b047d 100644 // Belize const PrepopulatedEngine* const engines_BZ[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, - &duckduckgo, -- &duckduckgo_light, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Canada const PrepopulatedEngine* const engines_CA[] = { -- &googleen, &google, &qwant, &bing, &yahoo_ca, &yahoo_qc, &duckduckgo, &duckduckgo_light, +- &google, &bing, &yahoo_ca, &yahoo_qc, &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Switzerland const PrepopulatedEngine* const engines_CH[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &duckduckgo, -- &duckduckgo_light, - &yahoo_ch, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Chile const PrepopulatedEngine* const engines_CL[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo_cl, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // China const PrepopulatedEngine* const engines_CN[] = { -- &baidu, &so_360, &googleen, &google, &qwant, &sogou, &bing, +- &baidu, &so_360, &google, &sogou, &bing, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Colombia const PrepopulatedEngine* const engines_CO[] = { -- &googleen, &google, &qwant, +- &google, - &yahoo_co, - &bing, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Costa Rica const PrepopulatedEngine* const engines_CR[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Czech Republic const PrepopulatedEngine* const engines_CZ[] = { -- &googleen, &google, &qwant, -- &seznam, +- &google, +- &seznam_cz, - &bing, - &yahoo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, @@ -1382,34 +1484,34 @@ index f3a41866f1df..668e496b047d 100644 // Germany const PrepopulatedEngine* const engines_DE[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo_de, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Denmark const PrepopulatedEngine* const engines_DK[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo_dk, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Dominican Republic const PrepopulatedEngine* const engines_DO[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Algeria const PrepopulatedEngine* const engines_DZ[] = { -- &googleen, &google, &qwant, +- &google, - &yahoo, - &bing, - &yandex_ru, @@ -1418,16 +1520,16 @@ index f3a41866f1df..668e496b047d 100644 // Ecuador const PrepopulatedEngine* const engines_EC[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Estonia const PrepopulatedEngine* const engines_EE[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yandex_ru, - &neti, @@ -1436,7 +1538,7 @@ index f3a41866f1df..668e496b047d 100644 // Egypt const PrepopulatedEngine* const engines_EG[] = { -- &googleen, &google, &qwant, +- &google, - &yahoo, - &bing, - &yandex_ru, @@ -1445,34 +1547,34 @@ index f3a41866f1df..668e496b047d 100644 // Spain const PrepopulatedEngine* const engines_ES[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo_es, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Finland const PrepopulatedEngine* const engines_FI[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo_fi, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Faroe Islands const PrepopulatedEngine* const engines_FO[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // France const PrepopulatedEngine* const engines_FR[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo_fr, - &qwant, @@ -1481,34 +1583,34 @@ index f3a41866f1df..668e496b047d 100644 // United Kingdom const PrepopulatedEngine* const engines_GB[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo_uk, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Greece const PrepopulatedEngine* const engines_GR[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Guatemala const PrepopulatedEngine* const engines_GT[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Hong Kong const PrepopulatedEngine* const engines_HK[] = { -- &googleen, &google, &qwant, +- &google, - &yahoo_hk, - &bing, - &baidu, @@ -1517,52 +1619,52 @@ index f3a41866f1df..668e496b047d 100644 // Honduras const PrepopulatedEngine* const engines_HN[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Croatia const PrepopulatedEngine* const engines_HR[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Hungary const PrepopulatedEngine* const engines_HU[] = { -- &googleen, &google, &qwant, +- &google, - &yahoo, - &bing, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Indonesia const PrepopulatedEngine* const engines_ID[] = { -- &googleen, &google, &qwant, +- &google, - &yahoo_id, - &bing, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Ireland const PrepopulatedEngine* const engines_IE[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Israel const PrepopulatedEngine* const engines_IL[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, - &yandex_ru, @@ -1571,16 +1673,16 @@ index f3a41866f1df..668e496b047d 100644 // India const PrepopulatedEngine* const engines_IN[] = { -- &googleen, &google, &qwant, +- &google, - &yahoo_in, - &bing, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Iraq const PrepopulatedEngine* const engines_IQ[] = { -- &googleen, &google, &qwant, +- &google, - &yahoo, - &bing, - &yandex_ru, @@ -1589,42 +1691,42 @@ index f3a41866f1df..668e496b047d 100644 // Iran const PrepopulatedEngine* const engines_IR[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, +-}; + &espot, &qwant, &duckduckgo, &duckduckgo_light, - }; // Iceland const PrepopulatedEngine* const engines_IS[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Italy const PrepopulatedEngine* const engines_IT[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Jamaica const PrepopulatedEngine* const engines_JM[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Jordan const PrepopulatedEngine* const engines_JO[] = { -- &googleen, &google, &qwant, +- &google, - &yahoo, - &bing, - &yandex_ru, @@ -1633,7 +1735,7 @@ index f3a41866f1df..668e496b047d 100644 // Japan const PrepopulatedEngine* const engines_JP[] = { -- &googleen, &google, &qwant, +- &google, - &yahoo_jp, - &bing, - &baidu, @@ -1642,16 +1744,16 @@ index f3a41866f1df..668e496b047d 100644 // Kenya const PrepopulatedEngine* const engines_KE[] = { -- &googleen, &google, &qwant, +- &google, - &yahoo, - &bing, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // South Korea const PrepopulatedEngine* const engines_KR[] = { -- &googleen, &google, &qwant, +- &google, - &naver, - &daum, - &bing, @@ -1660,7 +1762,7 @@ index f3a41866f1df..668e496b047d 100644 // Kuwait const PrepopulatedEngine* const engines_KW[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, - &ask, @@ -1669,7 +1771,7 @@ index f3a41866f1df..668e496b047d 100644 // Kazakhstan const PrepopulatedEngine* const engines_KZ[] = { -- &googleen, &google, &qwant, +- &google, - &yandex_kz, - &mail_ru, - &bing, @@ -1678,27 +1780,25 @@ index f3a41866f1df..668e496b047d 100644 // Lebanon const PrepopulatedEngine* const engines_LB[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, - &duckduckgo, -- &duckduckgo_light, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Liechtenstein const PrepopulatedEngine* const engines_LI[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &duckduckgo, -- &duckduckgo_light, - &yahoo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Lithuania const PrepopulatedEngine* const engines_LT[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, - &yandex_ru, @@ -1707,16 +1807,16 @@ index f3a41866f1df..668e496b047d 100644 // Luxembourg const PrepopulatedEngine* const engines_LU[] = { -- &googleen, &google, &qwant, +- &google, - &bing, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, - &yahoo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Latvia const PrepopulatedEngine* const engines_LV[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yandex_ru, - &yahoo, @@ -1725,7 +1825,7 @@ index f3a41866f1df..668e496b047d 100644 // Libya const PrepopulatedEngine* const engines_LY[] = { -- &googleen, &google, &qwant, +- &google, - &yahoo, - &bing, - &yandex_com, @@ -1734,7 +1834,7 @@ index f3a41866f1df..668e496b047d 100644 // Morocco const PrepopulatedEngine* const engines_MA[] = { -- &googleen, &google, &qwant, +- &google, - &yahoo, - &bing, - &yandex_ru, @@ -1743,25 +1843,25 @@ index f3a41866f1df..668e496b047d 100644 // Monaco const PrepopulatedEngine* const engines_MC[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Moldova const PrepopulatedEngine* const engines_MD[] = { -- &googleen, &google, &qwant, +- &google, - &yandex_ru, - &mail_ru, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Montenegro const PrepopulatedEngine* const engines_ME[] = { -- &googleen, &google, &qwant, +- &google, - &yahoo, - &bing, - &yandex_ru, @@ -1770,25 +1870,25 @@ index f3a41866f1df..668e496b047d 100644 // Macedonia const PrepopulatedEngine* const engines_MK[] = { -- &googleen, &google, &qwant, +- &google, - &yahoo, - &bing, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Mexico const PrepopulatedEngine* const engines_MX[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo_mx, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Malaysia const PrepopulatedEngine* const engines_MY[] = { -- &googleen, &google, &qwant, +- &google, - &yahoo_my, - &bing, - &baidu, @@ -1797,44 +1897,43 @@ index f3a41866f1df..668e496b047d 100644 // Nicaragua const PrepopulatedEngine* const engines_NI[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Netherlands const PrepopulatedEngine* const engines_NL[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo_nl, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Norway const PrepopulatedEngine* const engines_NO[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, - &duckduckgo, -- &duckduckgo_light, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // New Zealand const PrepopulatedEngine* const engines_NZ[] = { -- &googleen, &google, &qwant, +- &google, - &bing, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, - &yahoo_nz, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Oman const PrepopulatedEngine* const engines_OM[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, - &ask, @@ -1843,34 +1942,34 @@ index f3a41866f1df..668e496b047d 100644 // Panama const PrepopulatedEngine* const engines_PA[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Peru const PrepopulatedEngine* const engines_PE[] = { -- &googleen, &google, &qwant, +- &google, - &yahoo_pe, - &bing, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Philippines const PrepopulatedEngine* const engines_PH[] = { -- &googleen, &google, &qwant, +- &google, - &yahoo_ph, - &bing, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Pakistan const PrepopulatedEngine* const engines_PK[] = { -- &googleen, &google, &qwant, +- &google, - &yahoo, - &bing, - &baidu, @@ -1879,43 +1978,43 @@ index f3a41866f1df..668e496b047d 100644 // Poland const PrepopulatedEngine* const engines_PL[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Puerto Rico const PrepopulatedEngine* const engines_PR[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Portugal const PrepopulatedEngine* const engines_PT[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Paraguay const PrepopulatedEngine* const engines_PY[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Qatar const PrepopulatedEngine* const engines_QA[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, - &ask, @@ -1924,26 +2023,26 @@ index f3a41866f1df..668e496b047d 100644 // Romania const PrepopulatedEngine* const engines_RO[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Serbia const PrepopulatedEngine* const engines_RS[] = { -- &googleen, &google, &qwant, +- &google, - &yahoo, - &bing, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Russia const PrepopulatedEngine* const engines_RU[] = { - &yandex_ru, -- &googleen, &google, &qwant, +- &google, - &mail_ru, - &bing, + &espot, &qwant, &duckduckgo, &duckduckgo_light, @@ -1951,7 +2050,7 @@ index f3a41866f1df..668e496b047d 100644 // Rwanda const PrepopulatedEngine* const engines_RW[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, - &yandex_ru, @@ -1960,7 +2059,7 @@ index f3a41866f1df..668e496b047d 100644 // Saudi Arabia const PrepopulatedEngine* const engines_SA[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, - &yandex_com, @@ -1969,16 +2068,16 @@ index f3a41866f1df..668e496b047d 100644 // Sweden const PrepopulatedEngine* const engines_SE[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo_se, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Singapore const PrepopulatedEngine* const engines_SG[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo_sg, - &yandex_com, @@ -1987,34 +2086,34 @@ index f3a41866f1df..668e496b047d 100644 // Slovenia const PrepopulatedEngine* const engines_SI[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Slovakia const PrepopulatedEngine* const engines_SK[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // El Salvador const PrepopulatedEngine* const engines_SV[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Syria const PrepopulatedEngine* const engines_SY[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, - &yandex_ru, @@ -2023,7 +2122,7 @@ index f3a41866f1df..668e496b047d 100644 // Thailand const PrepopulatedEngine* const engines_TH[] = { -- &googleen, &google, &qwant, +- &google, - &yahoo_th, - &bing, - &ask, @@ -2032,7 +2131,7 @@ index f3a41866f1df..668e496b047d 100644 // Tunisia const PrepopulatedEngine* const engines_TN[] = { -- &googleen, &google, &qwant, +- &google, - &yahoo, - &bing, - &yandex_ru, @@ -2041,7 +2140,7 @@ index f3a41866f1df..668e496b047d 100644 // Turkey const PrepopulatedEngine* const engines_TR[] = { -- &googleen, &google, &qwant, +- &google, - &yandex_tr, - &yahoo_tr, - &bing, @@ -2050,16 +2149,16 @@ index f3a41866f1df..668e496b047d 100644 // Trinidad and Tobago const PrepopulatedEngine* const engines_TT[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Taiwan const PrepopulatedEngine* const engines_TW[] = { -- &googleen, &google, &qwant, +- &google, - &yahoo_tw, - &bing, - &baidu, @@ -2068,7 +2167,7 @@ index f3a41866f1df..668e496b047d 100644 // Tanzania const PrepopulatedEngine* const engines_TZ[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, - &yandex_ru, @@ -2077,7 +2176,7 @@ index f3a41866f1df..668e496b047d 100644 // Ukraine const PrepopulatedEngine* const engines_UA[] = { -- &googleen, &google, &qwant, +- &google, - &yandex_ua, - &mail_ru, - &bing, @@ -2086,34 +2185,34 @@ index f3a41866f1df..668e496b047d 100644 // United States const PrepopulatedEngine* const engines_US[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Uruguay const PrepopulatedEngine* const engines_UY[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Venezuela const PrepopulatedEngine* const engines_VE[] = { -- &googleen, &google, &qwant, +- &google, - &yahoo_ve, - &bing, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Vietnam const PrepopulatedEngine* const engines_VN[] = { -- &googleen, &google, &qwant, +- &google, - &coccoc, - &bing, - &yahoo_vn, @@ -2122,7 +2221,7 @@ index f3a41866f1df..668e496b047d 100644 // Yemen const PrepopulatedEngine* const engines_YE[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, - &baidu, @@ -2131,16 +2230,16 @@ index f3a41866f1df..668e496b047d 100644 // South Africa const PrepopulatedEngine* const engines_ZA[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, -- &duckduckgo, &duckduckgo_light, +- &duckduckgo, + &espot, &qwant, &duckduckgo, &duckduckgo_light, }; // Zimbabwe const PrepopulatedEngine* const engines_ZW[] = { -- &googleen, &google, &qwant, +- &google, - &bing, - &yahoo, - &baidu, @@ -2148,7 +2247,7 @@ index f3a41866f1df..668e496b047d 100644 }; // ---------------------------------------------------------------------------- -@@ -1286,7 +964,7 @@ std::vector> GetPrepopulatedEngines( +@@ -1280,7 +963,7 @@ std::vector> GetPrepopulatedEngines( if (default_search_provider_index) { const auto itr = std::find_if( t_urls.begin(), t_urls.end(), @@ -2157,7 +2256,7 @@ index f3a41866f1df..668e496b047d 100644 *default_search_provider_index = itr == t_urls.end() ? 0 : std::distance(t_urls.begin(), itr); } -@@ -1347,16 +1025,6 @@ std::unique_ptr GetPrepopulatedDefaultSearch( +@@ -1341,16 +1024,6 @@ std::unique_ptr GetPrepopulatedDefaultSearch( SearchEngineType GetEngineType(const GURL& url) { DCHECK(url.is_valid()); -- GitLab From e6452e1a1e4b50ca456c2dacbe7570de0ac3da83 Mon Sep 17 00:00:00 2001 From: Sooraj Date: Tue, 28 Jan 2020 11:30:10 +0530 Subject: [PATCH 6/6] fix build failure! --- build/bromite_patches_list.txt | 2 +- ...uckGo-Light-and-qwant-search-engine.patch} | 25 ++++++++++++++----- 2 files changed, 20 insertions(+), 7 deletions(-) rename build/patches/{0002-Fix-DuckDuckGo-Light-and-qwant-saerch-engine.patch => 0002-Fix-DuckDuckGo-Light-and-qwant-search-engine.patch} (55%) diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index 3bcda483..afa184b2 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -158,4 +158,4 @@ e-fix-settings-crash-issue.patch e-enable-custom-tabs-by-default.patch Fix-About-Chrome-regression.patch 0001-Launcher-icon-updated.patch -0002-Fix-DuckDuckGo-Light-and-qwant-saerch-engine.patch \ No newline at end of file +0002-Fix-DuckDuckGo-Light-and-qwant-search-engine.patch diff --git a/build/patches/0002-Fix-DuckDuckGo-Light-and-qwant-saerch-engine.patch b/build/patches/0002-Fix-DuckDuckGo-Light-and-qwant-search-engine.patch similarity index 55% rename from build/patches/0002-Fix-DuckDuckGo-Light-and-qwant-saerch-engine.patch rename to build/patches/0002-Fix-DuckDuckGo-Light-and-qwant-search-engine.patch index dbf86e62..07b848bf 100644 --- a/build/patches/0002-Fix-DuckDuckGo-Light-and-qwant-saerch-engine.patch +++ b/build/patches/0002-Fix-DuckDuckGo-Light-and-qwant-search-engine.patch @@ -1,12 +1,13 @@ -From d8ed055cc54a14e1269585364b5241d83975e996 Mon Sep 17 00:00:00 2001 +From 534f8b802068e2b8343b070296538ce50985e5bd Mon Sep 17 00:00:00 2001 From: Sooraj -Date: Tue, 28 Jan 2020 02:36:50 +0530 -Subject: [PATCH] Fix DuckDuckGo Light and qwant saerch engine +Date: Tue, 28 Jan 2020 11:22:56 +0530 +Subject: [PATCH] Fix DuckDuckGo Light and qwant search engine --- - components/search_engines/prepopulated_engines.json | 1 + - components/search_engines/search_engine_type.h | 1 + - 2 files changed, 2 insertions(+) + components/search_engines/prepopulated_engines.json | 1 + + components/search_engines/search_engine_type.h | 1 + + components/search_engines/template_url_prepopulate_data.cc | 1 + + 3 files changed, 3 insertions(+) diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json index 77c92706afac..6c7cf7635c2a 100644 @@ -32,6 +33,18 @@ index 355569fa52fd..036987c1b221 100644 SEARCH_ENGINE_PARSIJOO, SEARCH_ENGINE_QWANT, SEARCH_ENGINE_GIVERO, +diff --git a/components/search_engines/template_url_prepopulate_data.cc b/components/search_engines/template_url_prepopulate_data.cc +index 09bd7b8842fe..668e496b047d 100644 +--- a/components/search_engines/template_url_prepopulate_data.cc ++++ b/components/search_engines/template_url_prepopulate_data.cc +@@ -265,6 +265,7 @@ const PrepopulatedEngine* const engines_IQ[] = { + // Iran + const PrepopulatedEngine* const engines_IR[] = { + &espot, &qwant, &duckduckgo, &duckduckgo_light, ++}; + + // Iceland + const PrepopulatedEngine* const engines_IS[] = { -- 2.23.0 -- GitLab