Merge branch '3156-master-default_search' into 'master'

        git am -C0 -3 --ignore-whitespace "${root_dir}/build/e_patches/$file"

    done

    while read dir patch; do

        [ -z "$dir" ] && continue  # skip empty lines

        cd $chromium_dir/src/third_party/$dir

        git am -C0 -3 --ignore-whitespace "${root_dir}/build/third_party/$patch"

        cd $chromium_dir/src

    done < "${root_dir}/build/third_party_patches_list.txt"

    # Rename Chrome to Browser

    rename

From e6d957ecae604d43ffcc3d47a13baff64d9fde44 Mon Sep 17 00:00:00 2001

From 95389da2dc6c832af501fc1a2e1f64fbc603777d Mon Sep 17 00:00:00 2001

From: TheScarastic <warabhishek@e.email>

Date: Wed, 16 Nov 2022 11:14:01 +0000

Subject: Add Mojeek Search engine

 1 file changed, 1 insertion(+)

diff --git a/components/search_engines/search_engine_countries-inc.cc b/components/search_engines/search_engine_countries-inc.cc

index 38964682da20f..ae5b4298d910e 100644

index 2184d45677dcd..29cca1a481e63 100644

--- a/components/search_engines/search_engine_countries-inc.cc

+++ b/components/search_engines/search_engine_countries-inc.cc

@@ -42,6 +42,7 @@ constexpr EngineAndTier engines_default[] = {

@@ -43,6 +43,7 @@ constexpr EngineAndTier engines_default[] = {

     {SearchEngineTier::kTopEngines, &qwant},

     {SearchEngineTier::kTopEngines, &duckduckgo},

     {SearchEngineTier::kTopEngines, &duckduckgo_light},

 // Note, the below entries are sorted by country code, not the name in comment.

-- 

2.48.1

2.34.1

From a583aa33914da82d3a76a5cb71da25f105b0dc32 Mon Sep 17 00:00:00 2001

From 7461780b80b4b4bd73f8a1c5fbbc16c431be74e4 Mon Sep 17 00:00:00 2001

From: Aayush Gupta <theimpulson@e.email>

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

Subject: Browser: Modify default search engines

Signed-off-by: althafvly <althafvly@gmail.com>

Co-authored-by: althafvly <althafvly@gmail.com>

---

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

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

 .../browser/locale/LocaleManagerDelegate.java |  1 -

 .../locale/LocaleTemplateUrlLoader.java       |  8 ----

 .../cromite/cromite_prepopulated_engines.json | 10 +++++

 .../search_engine_countries-inc.cc            |  7 ++--

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

 .../cromite/cromite_prepopulated_engines.json | 32 ++++++++++++++

 .../search_engine_countries-inc.cc            |  8 ++--

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

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

 .../template_url_prepopulate_data.cc          |  7 +++-

 9 files changed, 26 insertions(+), 65 deletions(-)

 9 files changed, 50 insertions(+), 65 deletions(-)

diff --git a/chrome/browser/android/locale/locale_template_url_loader.cc b/chrome/browser/android/locale/locale_template_url_loader.cc

index 1cb4b8bd94469..412d2a7b29faf 100644

index 1cb4b8bd94469..d65f18f980387 100644

--- a/chrome/browser/android/locale/locale_template_url_loader.cc

+++ b/chrome/browser/android/locale/locale_template_url_loader.cc

@@ -11,6 +11,7 @@

 int LocaleTemplateUrlLoader::GetDesignatedSearchEngineForChina() {

-  return TemplateURLPrepopulateData::sogou.id;

+  return TemplateURLPrepopulateData::espot.id;

+  return TemplateURLPrepopulateData::murenasearch.id;

 }

 LocaleTemplateUrlLoader::~LocaleTemplateUrlLoader() = default;

     }

 }

diff --git a/components/search_engines/cromite/cromite_prepopulated_engines.json b/components/search_engines/cromite/cromite_prepopulated_engines.json

index 0d2ebbf08bfc7..d40c9982737d2 100644

index 0d2ebbf08bfc7..9a7616e880b02 100644

--- a/components/search_engines/cromite/cromite_prepopulated_engines.json

+++ b/components/search_engines/cromite/cromite_prepopulated_engines.json

@@ -13,6 +13,16 @@

@@ -13,6 +13,38 @@

             "id": 12

         },

+        "espot": {

+        "murenasearch": {

+          "name": "Murena Search",

+          "keyword": "murena.qwant.com",

+          "favicon_url": "https://www.qwant.com/favicon.ico",

+          "search_url": "https://murena.qwant.com/?q={searchTerms}",

+          "suggest_url": "https://api.qwant.com/api/suggest/?q={searchTerms}",

+          "type": "SEARCH_ENGINE_MURENASEARCH",

+          "id": 10,

+          "regulatory_extensions": [

+            {

+              "variant": "RegulatoryExtensionType::kDefault",

+              "search_params": "client=cs-chrome",

+              "suggest_params": "client=opensearch"

+            },

+            {

+              "variant": "RegulatoryExtensionType::kAndroidEEA",

+              "search_params": "client=acs",

+              "suggest_params": "client=opensearch"

+            }

+          ]

+        },

+

+        "spot": {

+            "name": "/e/ spot",

+            "keyword": "spot.murena.io",

+            "favicon_url": "https://spot.murena.io/favicon.ico",

+            "search_url": "https://spot.murena.io/?q={searchTerms}",

+            "suggest_url": "https://ac.duckduckgo.com/ac/?q={searchTerms}&type=list",

+            "type": "SEARCH_ENGINE_ESPOT",

+            "type": "SEARCH_ENGINE_SPOT",

+            "id": 11

+        },

+

             "name": "Google in English",

             "keyword": "googleen",

diff --git a/components/search_engines/search_engine_countries-inc.cc b/components/search_engines/search_engine_countries-inc.cc

index 235377432cf9c..38964682da20f 100644

index 235377432cf9c..2184d45677dcd 100644

--- a/components/search_engines/search_engine_countries-inc.cc

+++ b/components/search_engines/search_engine_countries-inc.cc

@@ -38,9 +38,10 @@ struct EngineAndTier {

@@ -38,9 +38,11 @@ struct EngineAndTier {

 // Default (for countries with no better engine set)

 constexpr EngineAndTier engines_default[] = {

-    {SearchEngineTier::kTopEngines, &google},

-    {SearchEngineTier::kTopEngines, &bing},

-    {SearchEngineTier::kTopEngines, &yahoo},

+    {SearchEngineTier::kTopEngines, &espot},

+    {SearchEngineTier::kTopEngines, &murenasearch},

+    {SearchEngineTier::kTopEngines, &spot},

+    {SearchEngineTier::kTopEngines, &qwant},

+    {SearchEngineTier::kTopEngines, &duckduckgo},

+    {SearchEngineTier::kTopEngines, &duckduckgo_light},

 // Note, the below entries are sorted by country code, not the name in comment.

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

index 18413c59ccdfd..2a53f07d642d8 100644

index 18413c59ccdfd..0b33877ee8bac 100644

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

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

@@ -93,11 +93,12 @@ enum SearchEngineType {

@@ -93,11 +93,13 @@ enum SearchEngineType {

   SEARCH_ENGINE_LILO = 74,

   SEARCH_ENGINE_GOOGLE_EN = 75,

   SEARCH_ENGINE_DUCKDUCKGOLIGHT = 76,

+  SEARCH_ENGINE_ESPOT = 77,

+  SEARCH_ENGINE_MURENASEARCH = 77,

+  SEARCH_ENGINE_SPOT = 78,

   SEARCH_ENGINE_MAX  // Bounding value needed for UMA histogram macro.

 };

-static_assert(SEARCH_ENGINE_DUCKDUCKGOLIGHT == (SEARCH_ENGINE_MAX - 1),

+static_assert(SEARCH_ENGINE_ESPOT == (SEARCH_ENGINE_MAX - 1),

+static_assert(SEARCH_ENGINE_SPOT == (SEARCH_ENGINE_MAX - 1),

               "Please check this patch");

 // Enum to record the type of search engine a user used in keyword mode. This

     if (SameDomain(url, GURL(engine->search_url))) {

       return engine->type;

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

index 5738c4f9853c7..e3dc518996051 100644

index 5738c4f9853c7..8c9beddc44a59 100644

--- a/components/search_engines/template_url_prepopulate_data.cc

+++ b/components/search_engines/template_url_prepopulate_data.cc

@@ -86,6 +86,11 @@ GetPrepopulatedEnginesForEeaRegionCountries(int country_id,

     search_engines::SearchEngineChoiceService* search_engine_choice_service) {

   return FindPrepopulatedEngineInternal(prefs, search_engine_choice_service,

-                                        google.id,

+                                        espot.id,

+                                        murenasearch.id,

                                         /*use_first_as_fallback=*/true);

 }

-- 

2.48.1

2.34.1

From a62d957aebbdf6f9ba96c2ccb520f67993713cde Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

Date: Wed, 16 Apr 2025 16:46:11 +0000

Subject: Migrate to murena search from spot

Needed for apps where browser search engine is used for search in apps.

For example BlissLauncher3

---

 .../chrome/browser/provider/SearchEngineProvider.java    | 9 ++++++++-

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

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/provider/SearchEngineProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/provider/SearchEngineProvider.java

index 299562413fe05..2d1741e8f6b3d 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/provider/SearchEngineProvider.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/provider/SearchEngineProvider.java

@@ -62,7 +62,14 @@ public class SearchEngineProvider extends ContentProvider {

             SharedPreferences sharedPreferences = getContext().getSharedPreferences(

                     CONFIGURATION_PREFERENCE_FILE_NAME, Context.MODE_PRIVATE);

             if (sharedPreferences != null) {

-                rowBuilder.add(sharedPreferences.getString(PREFERENCE_KEY, ""));

+                String searchEngine = sharedPreferences.getString(PREFERENCE_KEY, "");

+                if ("espot".equals(searchEngine)) {

+                    // Update to murena search in preferences if it was espot

+                    sharedPreferences.edit().putString(PREFERENCE_KEY, "murenasearch").apply();

+                    rowBuilder.add("murenasearch");

+                } else {

+                    rowBuilder.add(searchEngine);

+                }

             } else {

                 rowBuilder.add("");

             }

-- 

2.34.1

From 9f0ca5bbd4ae4fddf87b12c748d908132991cceb Mon Sep 17 00:00:00 2001

From 05fa947dd59ca105eecad07a769e49743d8068a8 Mon Sep 17 00:00:00 2001

From: Nishith Khanna <nishithkhanna@e.email>

Date: Thu, 11 Apr 2024 20:54:43 +0530

Subject: Update default sites

 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/components/ntp_tiles/resources/foundation_e.json b/components/ntp_tiles/resources/foundation_e.json

index 3c58051b91f8c..91b66bbdeb455 100644

index 3c58051b91f8c..a69f31774ae0c 100644

--- a/components/ntp_tiles/resources/foundation_e.json

+++ b/components/ntp_tiles/resources/foundation_e.json

@@ -1,8 +1,13 @@

+  },

+  {

+    "large_icon_url": "https://murena.com/wp-content/uploads/2022/11/murena-favicon.png",

+    "title": "/e/ Spot",

+    "url": "https://spot.murena.io/"

+    "title": "Murena Search",

+    "url": "https://murena.qwant.com/"

   }

 ]

-- 

2.48.1

2.34.1