diff --git a/patches/search-selection.patch b/patches/search-selection.patch deleted file mode 100644 index 4fdddd4d..00000000 --- a/patches/search-selection.patch +++ /dev/null @@ -1,45 +0,0 @@ -Copyright 2024-2025 The Trivalent Authors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software distributed under the License is -distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and limitations under the License. ---- -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 e4d2eacf3f316..0dfdd8c0d365d 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 -@@ -129,10 +129,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( -diff --git a/components/regional_capabilities/program_settings.cc b/components/regional_capabilities/program_settings.cc -index ad23174e4b..4dc197eccc 100644 ---- a/components/regional_capabilities/program_settings.cc -+++ b/components/regional_capabilities/program_settings.cc -@@ -48,7 +48,12 @@ constexpr ProgramSettings kDefaultSettings{ - .program = Program::kDefault, - .associated_countries = base::raw_span(), - .search_engine_list_type = SearchEngineListType::kTopN, -- .choice_screen_eligibility_config = std::nullopt, -+ .choice_screen_eligibility_config = -+ ChoiceScreenEligibilityConfig{ -+ .should_preserve_non_prepopulated_dse = false, -+ .should_preserve_imported_choice = false, -+ .should_preserve_non_google_dse = false, -+ }, - }; - - // "Fake" program used for baseline checks. Announces itself as Taiyaki, but