patches: e: Regenerate patches as required

From e0ac40f0dcb6d332c3be96263bd594c256462b0c Mon Sep 17 00:00:00 2001

From 37fdad5af9959318e10cef89aeda832a02e309e5 Mon Sep 17 00:00:00 2001

From: Aayush Gupta <theimpulson@e.email>

Date: Fri, 19 Mar 2021 06:28:45 +0100

Subject: [PATCH] [PATCH] privacy_preferences: Enable custom tabs by default

Date: Tue, 1 Jun 2021 05:56:26 +0200

Subject: [PATCH] privacy_preferences: Enable custom tabs by default

Signed-off-by: Aayush Gupta <theimpulson@e.email>

---

 chrome/android/java/res/xml/privacy_preferences.xml | 3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)

 chrome/android/java/res/xml/privacy_preferences.xml | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml

index da91f663d1ed..5bf9759058ab 100644

index 4707305f789d..ab730db7d006 100644

--- a/chrome/android/java/res/xml/privacy_preferences.xml

+++ b/chrome/android/java/res/xml/privacy_preferences.xml

@@ -46,7 +46,7 @@

@@ -51,7 +51,7 @@

         android:key="allow_custom_tab_intents"

         android:title="@string/allow_custom_tab_intents_title"

         android:summary="@string/allow_custom_tab_intents_summary"

-        android:defaultValue="false" />

+        android:defaultValue="true" />

     <org.chromium.components.browser_ui.settings.ChromeBasePreference

         android:key="secure_dns"

         android:title="@string/settings_secure_dns_title"

@@ -57,6 +57,7 @@

         android:title="@string/clear_browsing_data_title"

         android:summary="@string/clear_browsing_data_summary"

         android:fragment="org.chromium.chrome.browser.browsing_data.ClearBrowsingDataTabsFragment"

+        app:allowDividerBelow="false"

         android:order="5"/>

     <Preference

         android:key="privacy_sandbox"

         android:title="@string/prefs_privacy_sandbox"

-- 

2.17.1

From 7f9c133a5bee25ccdba0c98322aa64288d9bfebf Mon Sep 17 00:00:00 2001

From 1a6af9f45a87aa9f8a23f985e07e27ac4521aaac Mon Sep 17 00:00:00 2001

From: Aayush Gupta <theimpulson@e.email>

Date: Thu, 18 Mar 2021 13:42:44 +0100

Subject: [PATCH] Set search engines

 .../locale/locale_template_url_loader.cc      |   35 +-

 .../locale/locale_template_url_loader.h       |    1 -

 .../search_engines/prepopulated_engines.json  | 1105 +----------------

 .../search_engines/search_engine_type.h       |    2 +

 .../search_engines/search_engine_type.h       |    3 +-

 .../search_engines/search_engine_utils.cc     |   12 +-

 .../template_url_prepopulate_data.cc          |  645 ++--------

 8 files changed, 133 insertions(+), 1677 deletions(-)

 8 files changed, 133 insertions(+), 1678 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 cf802ccf763a..985d67dfa316 100644

   "generate_array": {

diff --git a/components/search_engines/search_engine_type.h b/components/search_engines/search_engine_type.h

index 707c5c8785b9..2e12dab86060 100644

index d785553ee907..aa4780e15d2d 100644

--- a/components/search_engines/search_engine_type.h

+++ b/components/search_engines/search_engine_type.h

@@ -15,6 +15,7 @@ enum SearchEngineType {

   // Prepopulated engines.

   SEARCH_ENGINE_UNKNOWN = -1,

   SEARCH_ENGINE_OTHER = 0,  // At the top in case of future list changes.

+  SEARCH_ENGINE_ESPOT,

   SEARCH_ENGINE_AOL,

   SEARCH_ENGINE_ASK,

   SEARCH_ENGINE_ATLAS,

@@ -65,6 +66,7 @@ enum SearchEngineType {

   SEARCH_ENGINE_360,

   SEARCH_ENGINE_COCCOC,

   SEARCH_ENGINE_DUCKDUCKGO,

+  SEARCH_ENGINE_DUCKDUCKGOLIGHT,

   SEARCH_ENGINE_PARSIJOO,

   SEARCH_ENGINE_QWANT,

   SEARCH_ENGINE_GIVERO,

@@ -74,7 +74,8 @@ enum SearchEngineType {

   SEARCH_ENGINE_OCEANHERO = 57,

   SEARCH_ENGINE_PRIVACYWALL = 58,

   SEARCH_ENGINE_ECOSIA = 59,

-

+  SEARCH_ENGINE_ESPOT = 60,

+  SEARCH_ENGINE_DUCKDUCKGOLIGHT = 61,

   SEARCH_ENGINE_MAX  // Bounding value needed for UMA histogram macro.

 };

diff --git a/components/search_engines/search_engine_utils.cc b/components/search_engines/search_engine_utils.cc

index ecbd15614ef0..20b6bc09e102 100644

--- a/components/search_engines/search_engine_utils.cc