Update default search in JP - phase 2

fix brave/brave-browser#44769

Author: simonhong

browser/search_engines/normal_window_search_engine_provider_service.cc

@@ -5,12 +5,20 @@
 
 #include "brave/browser/search_engines/normal_window_search_engine_provider_service.h"
 
+#include <string>
+
 #include "base/functional/bind.h"
+#include "brave/browser/search_engines/pref_names.h"
 #include "brave/browser/search_engines/search_engine_provider_util.h"
+#include "brave/components/l10n/common/country_code_util.h"
+#include "brave/components/search_engines/brave_prepopulated_engines.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
+#include "chrome/common/pref_names.h"
+#include "components/country_codes/country_codes.h"
 #include "components/search_engines/search_engines_pref_names.h"
+#include "components/search_engines/template_url_prepopulate_data.h"
 #include "components/search_engines/template_url_service.h"
 
 NormalWindowSearchEngineProviderService::
@@ -26,7 +34,7 @@ NormalWindowSearchEngineProviderService::
 
   auto* service = TemplateURLServiceFactory::GetForProfile(profile_);
   if (service->loaded()) {
-    PrepareInitialPrivateSearchProvider();
+    OnTemplateURLServiceLoaded();
     return;
   }
 
@@ -48,6 +56,7 @@ void NormalWindowSearchEngineProviderService::Shutdown() {
 void NormalWindowSearchEngineProviderService::OnTemplateURLServiceLoaded() {
   template_url_service_subscription_ = {};
   PrepareInitialPrivateSearchProvider();
+  MigrateSearchEnginePrefsInJP();
 }
 
 void NormalWindowSearchEngineProviderService::
@@ -58,3 +67,48 @@ void NormalWindowSearchEngineProviderService::
 void NormalWindowSearchEngineProviderService::OnPreferenceChanged() {
   brave::UpdateDefaultPrivateSearchProviderData(*profile_);
 }
+
+void NormalWindowSearchEngineProviderService::MigrateSearchEnginePrefsInJP() {
+  auto* prefs = profile_->GetPrefs();
+  if (prefs->GetBoolean(kMigratedSearchDefaultInJP)) {
+    return;
+  }
+
+  prefs->SetBoolean(kMigratedSearchDefaultInJP, true);
+
+  const std::string country_string =
+      brave_l10n::GetCountryCode(g_browser_process->local_state());
+  if (country_string != "JP") {
+    return;
+  }
+
+  auto* preference =
+      prefs->FindPreference(prefs::kSyncedDefaultSearchProviderGUID);
+  if (preference->HasUserSetting()) {
+    return;
+  }
+
+  auto* service = TemplateURLServiceFactory::GetForProfile(profile_);
+  if (service->loaded()) {
+    return;
+  }
+
+  if (service->GetDefaultSearchProvider()->prepopulate_id() ==
+      TemplateURLPrepopulateData::PREPOPULATED_ENGINE_ID_YAHOO_JP) {
+    return;
+  }
+
+  auto data = TemplateURLPrepopulateData::GetPrepopulatedEngine(
+      *prefs, country_codes::CountryStringToCountryID(country_string),
+      TemplateURLPrepopulateData::PREPOPULATED_ENGINE_ID_YAHOO_JP);
+  if (!data) {
+    return;
+  }
+
+  TemplateURL url(*data);
+  service->SetUserSelectedDefaultSearchProvider(&url);
+
+  if (prefs->GetBoolean(prefs::kSearchSuggestEnabled)) {
+    prefs->SetBoolean(prefs::kSearchSuggestEnabled, false);
+  }
+}

browser/search_engines/normal_window_search_engine_provider_service.h

@@ -38,6 +38,7 @@ class NormalWindowSearchEngineProviderService : public KeyedService {
   void OnTemplateURLServiceLoaded();
   void PrepareInitialPrivateSearchProvider();
   void OnPreferenceChanged();
+  void MigrateSearchEnginePrefsInJP();
 
   raw_ptr<Profile> profile_ = nullptr;
   StringPrefMember private_search_provider_guid_;

browser/search_engines/pref_names.h

@@ -10,4 +10,8 @@
 inline constexpr char kEnableSearchSuggestionsByDefault[] =
     "brave.enable_search_suggestions_by_default";
 
+// Profile prefs
+inline constexpr char kMigratedSearchDefaultInJP[] =
+    "brave.migrated_search_default_in_jp";
+
 #endif  // BRAVE_BROWSER_SEARCH_ENGINES_PREF_NAMES_H_

browser/search_engines/search_engine_provider_service_browsertest.cc

@@ -10,6 +10,7 @@
 #include "brave/browser/profile_resetter/brave_profile_resetter.h"
 #include "brave/browser/profiles/brave_profile_manager.h"
 #include "brave/browser/profiles/profile_util.h"
+#include "brave/browser/search_engines/pref_names.h"
 #include "brave/browser/search_engines/search_engine_provider_service_factory.h"
 #include "brave/browser/search_engines/search_engine_provider_util.h"
 #include "brave/browser/ui/browser_commands.h"
@@ -279,6 +280,73 @@ INSTANTIATE_TEST_SUITE_P(
         {"ko_KR", true, false},
         {"ko_KR", false, false}}));
 
+class MigrateSearchEnginePrefsInJPTest : public InProcessBrowserTest {
+ public:
+  MigrateSearchEnginePrefsInJPTest() = default;
+  ~MigrateSearchEnginePrefsInJPTest() override = default;
+
+  TemplateURLService* service() {
+    return TemplateURLServiceFactory::GetForProfile(browser()->profile());
+  }
+
+  PrefService* prefs() { return browser()->profile()->GetPrefs(); }
+
+ private:
+  const brave_l10n::test::ScopedDefaultLocale default_locale{"ja_JP"};
+};
+
+IN_PROC_BROWSER_TEST_F(MigrateSearchEnginePrefsInJPTest,
+                       PRE_PRE_DefaultSearchProviderUpdateTest) {
+  EXPECT_TRUE(VerifyTemplateURLServiceLoad(service()));
+
+  // To simulate existing user at next launch, set 31
+  // as we set yahoo as a default in jp at 31.
+  // At the next launch, default provider will be yahoo by setting 31.
+  prefs()->SetInteger(prefs::kBraveDefaultSearchVersion, 31);
+
+  // To run migration code again at the next launch.
+  prefs()->ClearPref(kMigratedSearchDefaultInJP);
+  prefs()->SetBoolean(prefs::kSearchSuggestEnabled, true);
+}
+
+// To verify migration code doesn't touch search suggestions if current provider
+// is yahoo jp.
+IN_PROC_BROWSER_TEST_F(MigrateSearchEnginePrefsInJPTest,
+                       PRE_DefaultSearchProviderUpdateTest) {
+  EXPECT_TRUE(VerifyTemplateURLServiceLoad(service()));
+
+  const int provider_id =
+      service()->GetDefaultSearchProvider()->prepopulate_id();
+  EXPECT_EQ(provider_id,
+            static_cast<int>(
+                TemplateURLPrepopulateData::PREPOPULATED_ENGINE_ID_YAHOO_JP));
+  EXPECT_TRUE(prefs()->GetBoolean(prefs::kSearchSuggestEnabled));
+
+  // To simulate existing user at next launch, set older version than 31
+  // as we set yahoo as a default in jp at 31.
+  // At the next launch, default provider will be google by setting old
+  // version number.
+  prefs()->SetInteger(prefs::kBraveDefaultSearchVersion, 30);
+
+  // To run migration code again at the next launch.
+  service()->SetUserSelectedDefaultSearchProvider(nullptr);
+  prefs()->ClearPref(prefs::kSyncedDefaultSearchProviderGUID);
+  prefs()->ClearPref(kMigratedSearchDefaultInJP);
+  prefs()->SetBoolean(prefs::kSearchSuggestEnabled, true);
+}
+
+IN_PROC_BROWSER_TEST_F(MigrateSearchEnginePrefsInJPTest,
+                       DefaultSearchProviderUpdateTest) {
+  EXPECT_TRUE(VerifyTemplateURLServiceLoad(service()));
+
+  const int provider_id =
+      service()->GetDefaultSearchProvider()->prepopulate_id();
+  EXPECT_EQ(provider_id,
+            static_cast<int>(
+                TemplateURLPrepopulateData::PREPOPULATED_ENGINE_ID_YAHOO_JP));
+  EXPECT_FALSE(prefs()->GetBoolean(prefs::kSearchSuggestEnabled));
+}
+
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 
 namespace extensions {

browser/search_engines/search_engine_provider_service_factory.cc

@@ -23,6 +23,7 @@
 #include "brave/browser/search_engines/private_window_search_engine_provider_service_android.h"
 #else
 #include "brave/browser/search_engines/normal_window_search_engine_provider_service.h"
+#include "brave/browser/search_engines/pref_names.h"
 #include "brave/browser/search_engines/private_window_search_engine_provider_service.h"
 #include "brave/browser/search_engines/tor_window_search_engine_provider_service.h"
 #endif
@@ -99,6 +100,7 @@ void SearchEngineProviderServiceFactory::RegisterProfilePrefs(
 #if !BUILDFLAG(IS_ANDROID)
   registry->RegisterBooleanPref(prefs::kDefaultSearchProviderByExtension,
                                 false);
+  registry->RegisterBooleanPref(kMigratedSearchDefaultInJP, false);
   registry->RegisterStringPref(prefs::kSyncedDefaultPrivateSearchProviderGUID,
                                std::string(),
                                user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);