Fixed crash with search provider extension

browser/BUILD.gn

@@ -74,10 +74,6 @@ source_set("browser_process") {
     "geolocation/brave_geolocation_permission_context_delegate.h",
     "metrics/metrics_reporting_util.cc",
     "metrics/metrics_reporting_util.h",
-    "search_engines/guest_window_search_engine_provider_service.cc",
-    "search_engines/guest_window_search_engine_provider_service.h",
-    "search_engines/private_window_search_engine_provider_service.cc",
-    "search_engines/private_window_search_engine_provider_service.h",
     "search_engines/search_engine_provider_service.cc",
     "search_engines/search_engine_provider_service.h",
     "search_engines/search_engine_provider_service_factory.cc",
@@ -86,8 +82,6 @@ source_set("browser_process") {
     "search_engines/search_engine_provider_util.h",
     "search_engines/search_engine_tracker.cc",
     "search_engines/search_engine_tracker.h",
-    "search_engines/tor_window_search_engine_provider_service.cc",
-    "search_engines/tor_window_search_engine_provider_service.h",
     "update_util.cc",
     "update_util.h",
   ]

browser/profiles/brave_profile_manager.cc

@@ -156,14 +156,11 @@ bool BraveProfileManager::LoadProfileByPath(const base::FilePath& profile_path,
                                            std::move(callback));
 }
 
-// This overridden method doesn't clear |kDefaultSearchProviderDataPrefName|.
-// W/o this, prefs set by TorWindowSearchEngineProviderService is cleared
-// during the initialization.
 void BraveProfileManager::SetNonPersonalProfilePrefs(Profile* profile) {
+  ProfileManager::SetNonPersonalProfilePrefs(profile);
+
   PrefService* prefs = profile->GetPrefs();
   prefs->SetBoolean(prefs::kSigninAllowed, false);
-  prefs->SetBoolean(bookmarks::prefs::kEditBookmarksEnabled, false);
-  prefs->SetBoolean(bookmarks::prefs::kShowBookmarkBar, false);
 }
 
 void BraveProfileManager::MigrateProfileNames() {

browser/search_engines/search_engine_provider_service.cc

@@ -1,9 +1,12 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* Copyright (c) 2021 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "brave/browser/search_engines/search_engine_provider_service.h"
 
+#include <vector>
+
 #include "brave/browser/search_engines/search_engine_provider_util.h"
 #include "brave/common/pref_names.h"
 #include "brave/components/search_engines/brave_prepopulated_engines.h"
@@ -12,52 +15,54 @@
 #include "components/prefs/pref_service.h"
 #include "components/search_engines/prepopulated_engines.h"
 #include "components/search_engines/template_url_prepopulate_data.h"
-#include "components/search_engines/template_url_service.h"
 
-SearchEngineProviderService::SearchEngineProviderService(
-    Profile* otr_profile)
-    : otr_profile_(otr_profile),
-      original_template_url_service_(
-          TemplateURLServiceFactory::GetForProfile(
-              otr_profile_->GetOriginalProfile())),
-      otr_template_url_service_(
-          TemplateURLServiceFactory::GetForProfile(otr_profile_)) {
+SearchEngineProviderService::SearchEngineProviderService(Profile* profile)
+    : profile_(profile),
+      template_url_service_(
+          TemplateURLServiceFactory::GetForProfile(profile_)) {
   use_alternative_search_engine_provider_.Init(
       kUseAlternativeSearchEngineProvider,
-      otr_profile_->GetOriginalProfile()->GetPrefs(),
+      profile_->GetOriginalProfile()->GetPrefs(),
       base::Bind(&SearchEngineProviderService::OnPreferenceChanged,
                  base::Unretained(this)));
 
-  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);
+  std::unique_ptr<TemplateURLData> data =
+      brave::GetDDGTemplateURLData(profile->GetPrefs());
   alternative_search_engine_url_.reset(new TemplateURL(*data));
+  observation_.Observe(template_url_service_);
 }
 
-SearchEngineProviderService::~SearchEngineProviderService() {
+SearchEngineProviderService::~SearchEngineProviderService() = default;
+
+void SearchEngineProviderService::OnTemplateURLServiceChanged() {
+  // When this change is came from pref changing, we don't need to control
+  // prefs again.
+  if (ignore_template_url_service_changing_)
+    return;
+
+  // The purpose of below code is toggling alternative prefs
+  // when user changes from ddg to different search engine provider
+  // (or vice versa) from settings ui.
+  const bool is_ddg_is_set =
+      template_url_service_->GetDefaultSearchProvider()->prepopulate_id() ==
+      alternative_search_engine_url_->prepopulate_id();
+  if (UseAlternativeSearchEngineProvider() || is_ddg_is_set)
+    brave::ToggleUseAlternativeSearchEngineProvider(profile_);
 }
 
 void SearchEngineProviderService::OnPreferenceChanged(
     const std::string& pref_name) {
   DCHECK(pref_name == kUseAlternativeSearchEngineProvider);
-  DCHECK(!brave::IsRegionForQwant(otr_profile_));
 
-  OnUseAlternativeSearchEngineProviderChanged();
+  // When this call is from setting's change, we don't need to set provider
+  // again.
+  if (ignore_template_url_service_changing_)
+    return;
+
+  base::AutoReset<bool> reset(&ignore_template_url_service_changing_, true);
+  UseAlternativeSearchEngineProvider()
+      ? ChangeToAlternativeSearchEngineProvider()
+      : ChangeToDefaultSearchEngineProvider();
 }
 
 bool
@@ -66,13 +71,10 @@ SearchEngineProviderService::UseAlternativeSearchEngineProvider() const {
 }
 
 void SearchEngineProviderService::ChangeToAlternativeSearchEngineProvider() {
-  otr_template_url_service_->SetUserSelectedDefaultSearchProvider(
+  template_url_service_->SetUserSelectedDefaultSearchProvider(
       alternative_search_engine_url_.get());
 }
 
-void SearchEngineProviderService::ChangeToNormalWindowSearchEngineProvider() {
-  TemplateURL normal_url(
-      original_template_url_service_->GetDefaultSearchProvider()->data());
-  otr_template_url_service_->SetUserSelectedDefaultSearchProvider(
-      &normal_url);
+void SearchEngineProviderService::ChangeToDefaultSearchEngineProvider() {
+  template_url_service_->SetUserSelectedDefaultSearchProvider(nullptr);
 }