From c69159866b90d6dec7252e2fe2ec204b18245bf6 Mon Sep 17 00:00:00 2001
From: brave-builds <devops@brave.com>
Date: Fri, 11 Oct 2019 16:03:34 +0000
Subject: [PATCH] Uplift of #3672 (squashed) to beta

---
 .../search_engine_provider_service.cc         | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/browser/search_engines/search_engine_provider_service.cc b/browser/search_engines/search_engine_provider_service.cc
index 5be470eb3960..14a1fcb3082c 100644
--- a/browser/search_engines/search_engine_provider_service.cc
+++ b/browser/search_engines/search_engine_provider_service.cc
@@ -28,9 +28,24 @@ SearchEngineProviderService::SearchEngineProviderService(
       base::Bind(&SearchEngineProviderService::OnPreferenceChanged,
                  base::Unretained(this)));
 
-  auto data = TemplateURLPrepopulateData::GetPrepopulatedEngine(
-      otr_profile->GetPrefs(),
-      TemplateURLPrepopulateData::PREPOPULATED_ENGINE_ID_DUCKDUCKGO);
+  std::vector<TemplateURLPrepopulateData::BravePrepopulatedEngineID>
+      alt_search_providers = {
+          TemplateURLPrepopulateData::PREPOPULATED_ENGINE_ID_DUCKDUCKGO,
+          TemplateURLPrepopulateData::PREPOPULATED_ENGINE_ID_DUCKDUCKGO_DE,
+          TemplateURLPrepopulateData::
+              PREPOPULATED_ENGINE_ID_DUCKDUCKGO_AU_NZ_IE
+      };
+
+  std::unique_ptr<TemplateURLData> data;
+  for (const auto& id : alt_search_providers) {
+    data = TemplateURLPrepopulateData::GetPrepopulatedEngine(
+        otr_profile->GetPrefs(), id);
+    if (data)
+      break;
+  }
+
+  // There should ALWAYS be one entry
+  DCHECK(data);
   alternative_search_engine_url_.reset(new TemplateURL(*data));
 }