From 12393ab1532a032418679aecc4d1add0b13713ef Mon Sep 17 00:00:00 2001
From: Simon Hong <shong@brave.com>
Date: Tue, 21 Jun 2022 13:53:44 +0900
Subject: [PATCH] Updated default search provider in KR

fix https://github.com/brave/brave-browser/issues/18855

Default search provider list will include
Brave Search, Naver, Daum and Google.
And Naver will be set as a default provider.
---
 browser/search_engines/search_engine_tracker.cc           | 4 ++++
 browser/search_engines/search_engine_tracker.h            | 4 +++-
 .../search_engines/template_url_prepopulate_data.cc       | 8 ++++++++
 components/search_engines/brave_prepopulated_engines.cc   | 4 +++-
 components/search_engines/brave_prepopulated_engines.h    | 2 ++
 5 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/browser/search_engines/search_engine_tracker.cc b/browser/search_engines/search_engine_tracker.cc
index bedd10c6970..eac508a17f2 100644
--- a/browser/search_engines/search_engine_tracker.cc
+++ b/browser/search_engines/search_engine_tracker.cc
@@ -43,6 +43,10 @@ void RecordSearchEngineP3A(const GURL& search_engine_url,
     answer = SearchEngineP3A::kYandex;
   } else if (type == SEARCH_ENGINE_ECOSIA) {
     answer = SearchEngineP3A::kEcosia;
+  } else if (type == SEARCH_ENGINE_DAUM) {
+    answer = SearchEngineP3A::kDaum;
+  } else if (type == SEARCH_ENGINE_NAVER) {
+    answer = SearchEngineP3A::kNaver;
   } else if (type == SEARCH_ENGINE_OTHER) {
     if (base::EndsWith(search_engine_url.host(), "startpage.com",
                        base::CompareCase::INSENSITIVE_ASCII)) {
diff --git a/browser/search_engines/search_engine_tracker.h b/browser/search_engines/search_engine_tracker.h
index 7e36850cf4a..070c7050a15 100644
--- a/browser/search_engines/search_engine_tracker.h
+++ b/browser/search_engines/search_engine_tracker.h
@@ -37,7 +37,9 @@ enum class SearchEngineP3A {
   kYandex,
   kEcosia,
   kBrave,
-  kMaxValue = kBrave,
+  kDaum,
+  kNaver,
+  kMaxValue = kNaver,
 };
 
 // Note: append-only enumeration! Never remove any existing values, as this enum
diff --git a/chromium_src/components/search_engines/template_url_prepopulate_data.cc b/chromium_src/components/search_engines/template_url_prepopulate_data.cc
index f0a672ff248..dea689be596 100644
--- a/chromium_src/components/search_engines/template_url_prepopulate_data.cc
+++ b/chromium_src/components/search_engines/template_url_prepopulate_data.cc
@@ -81,6 +81,13 @@ const std::vector<BravePrepopulatedEngineID> brave_engines_AU_IE = {
     PREPOPULATED_ENGINE_ID_ECOSIA,
 };
 
+const std::vector<BravePrepopulatedEngineID> brave_engines_KR = {
+    PREPOPULATED_ENGINE_ID_BRAVE,
+    PREPOPULATED_ENGINE_ID_NAVER,
+    PREPOPULATED_ENGINE_ID_DAUM,
+    PREPOPULATED_ENGINE_ID_GOOGLE,
+};
+
 const std::vector<BravePrepopulatedEngineID> brave_engines_NZ = {
     PREPOPULATED_ENGINE_ID_BRAVE,  PREPOPULATED_ENGINE_ID_DUCKDUCKGO_AU_NZ_IE,
     PREPOPULATED_ENGINE_ID_GOOGLE, PREPOPULATED_ENGINE_ID_QWANT,
@@ -127,6 +134,7 @@ const std::map<int, const std::vector<BravePrepopulatedEngineID>*>
          &brave_engines_with_ecosia},
         {country_codes::CountryCharsToCountryID('K', 'G'),
          &brave_engines_with_yandex},
+        {country_codes::CountryCharsToCountryID('K', 'R'), &brave_engines_KR},
         {country_codes::CountryCharsToCountryID('K', 'Z'),
          &brave_engines_with_yandex},
         {country_codes::CountryCharsToCountryID('L', 'U'),
diff --git a/components/search_engines/brave_prepopulated_engines.cc b/components/search_engines/brave_prepopulated_engines.cc
index b02bec56222..0f28122c050 100644
--- a/components/search_engines/brave_prepopulated_engines.cc
+++ b/components/search_engines/brave_prepopulated_engines.cc
@@ -13,7 +13,7 @@ namespace TemplateURLPrepopulateData {
 
 // IMPORTANT! Make sure to bump this value if you make changes to the
 // engines below or add/remove engines.
-const int kBraveCurrentDataVersion = 22;
+const int kBraveCurrentDataVersion = 23;
 // DO NOT CHANGE THIS ONE. Used for backfilling kBraveDefaultSearchVersion.
 const int kBraveFirstTrackedDataVersion = 6;
 
@@ -25,6 +25,8 @@ const std::map<BravePrepopulatedEngineID, const PrepopulatedEngine*>
         {PREPOPULATED_ENGINE_ID_GOOGLE, &google},
         {PREPOPULATED_ENGINE_ID_YANDEX, &brave_yandex},
         {PREPOPULATED_ENGINE_ID_BING, &brave_bing},
+        {PREPOPULATED_ENGINE_ID_NAVER, &naver},
+        {PREPOPULATED_ENGINE_ID_DAUM, &daum},
         {PREPOPULATED_ENGINE_ID_DUCKDUCKGO, &duckduckgo},
         {PREPOPULATED_ENGINE_ID_DUCKDUCKGO_DE, &duckduckgo_de},
         {PREPOPULATED_ENGINE_ID_DUCKDUCKGO_AU_NZ_IE, &duckduckgo_au_nz_ie},
diff --git a/components/search_engines/brave_prepopulated_engines.h b/components/search_engines/brave_prepopulated_engines.h
index 7fe2fd444c1..da496cf0331 100644
--- a/components/search_engines/brave_prepopulated_engines.h
+++ b/components/search_engines/brave_prepopulated_engines.h
@@ -31,6 +31,8 @@ enum BravePrepopulatedEngineID : unsigned int {
   PREPOPULATED_ENGINE_ID_GOOGLE = 1,
   PREPOPULATED_ENGINE_ID_BING = 3,
   PREPOPULATED_ENGINE_ID_YANDEX = 15,
+  PREPOPULATED_ENGINE_ID_NAVER = 67,
+  PREPOPULATED_ENGINE_ID_DAUM = 68,
   PREPOPULATED_ENGINE_ID_ECOSIA = 101,
   // These engine IDs are not defined in Chromium
   BRAVE_PREPOPULATED_ENGINES_START = 500,