From ae4ea5cb5389e88cbe4465dcd09ac9bd71419328 Mon Sep 17 00:00:00 2001
From: Root <175176948+RKNF404@users.noreply.github.com>
Date: Thu, 20 Feb 2025 19:55:10 -0500
Subject: [PATCH 1/2] feat: enable search engine selection screen in non-EEA

---
 patches/search-selection.patch | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 patches/search-selection.patch

diff --git a/patches/search-selection.patch b/patches/search-selection.patch
new file mode 100644
index 00000000..1830b473
--- /dev/null
+++ b/patches/search-selection.patch
@@ -0,0 +1,18 @@
+diff --git a/components/search_engines/search_engine_choice/search_engine_choice_service.cc b/components/search_engines/search_engine_choice/search_engine_choice_service.cc
+index c152260117ccc..904423cc3095b 100644
+--- a/components/search_engines/search_engine_choice/search_engine_choice_service.cc
++++ b/components/search_engines/search_engine_choice/search_engine_choice_service.cc
+@@ -256,13 +256,6 @@ SearchEngineChoiceService::GetStaticChoiceScreenConditions(
+     return SearchEngineChoiceScreenConditions::kAlreadyCompleted;
+   }
+ 
+-  int country_id = GetCountryId();
+-  DVLOG(1) << "Checking country for choice screen, found: "
+-           << country_codes::CountryIDToCountryString(country_id);
+-  if (!IsEeaChoiceCountry(country_id)) {
+-    return SearchEngineChoiceScreenConditions::kNotInRegionalScope;
+-  }
+-
+   // Initially exclude users with this type of override. Consult b/302675777 for
+   // next steps.
+   if (profile_prefs_->HasPrefPath(prefs::kSearchProviderOverrides)) {

From 30e837c450ca46bff2518ced7b6574e323996496 Mon Sep 17 00:00:00 2001
From: Root <175176948+RKNF404@users.noreply.github.com>
Date: Fri, 21 Feb 2025 09:24:36 -0500
Subject: [PATCH 2/2] chore: enable selection screen without the flag

---
 patches/search-selection.patch | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/patches/search-selection.patch b/patches/search-selection.patch
index 1830b473..6dfacc30 100644
--- a/patches/search-selection.patch
+++ b/patches/search-selection.patch
@@ -16,3 +16,18 @@ index c152260117ccc..904423cc3095b 100644
    // Initially exclude users with this type of override. Consult b/302675777 for
    // next steps.
    if (profile_prefs_->HasPrefPath(prefs::kSearchProviderOverrides)) {
+diff --git a/chrome/browser/search_engine_choice/search_engine_choice_dialog_service_factory.cc b/chrome/browser/search_engine_choice/search_engine_choice_dialog_service_factory.cc
+index 96286eaf96db2..75f0eee1d82c4 100644
+--- a/chrome/browser/search_engine_choice/search_engine_choice_dialog_service_factory.cc
++++ b/chrome/browser/search_engine_choice/search_engine_choice_dialog_service_factory.cc
+@@ -128,10 +128,6 @@ SearchEngineChoiceDialogServiceFactory::BuildServiceInstanceForBrowserContext(
+ 
+   base::CommandLine* const command_line =
+       base::CommandLine::ForCurrentProcess();
+-  if (!g_is_chrome_build &&
+-      !command_line->HasSwitch(switches::kForceSearchEngineChoiceScreen)) {
+-    return nullptr;
+-  }
+ 
+   if (command_line->HasSwitch(switches::kNoFirstRun) &&
+       !command_line->HasSwitch(