Index: components/search_engines/template_url_service.cc |
diff --git a/components/search_engines/template_url_service.cc b/components/search_engines/template_url_service.cc |
index 664fa3390a3a2ec1775d070a925493347201018e..cab661ea91763fe3514168e4d1eefb0dbb3c694e 100644 |
--- a/components/search_engines/template_url_service.cc |
+++ b/components/search_engines/template_url_service.cc |
@@ -491,9 +491,6 @@ TemplateURL* TemplateURLService::AddExtensionControlledTURL( |
KeywordWebDataService::BatchModeScoper scoper(web_data_service_.get()); |
TemplateURL* template_url_ptr = AddNoNotify(std::move(template_url), true); |
if (template_url_ptr) { |
- if (template_url_ptr->extension_info_->wants_to_be_default_engine) { |
- UpdateExtensionDefaultSearchEngine(); |
- } |
NotifyObservers(); |
} |
@@ -513,12 +510,10 @@ void TemplateURLService::RemoveExtensionControlledTURL( |
if (!url) |
return; |
// NULL this out so that we can call RemoveNoNotify. |
- // UpdateExtensionDefaultSearchEngine will cause it to be reset. |
if (default_search_provider_ == url) |
default_search_provider_ = nullptr; |
KeywordWebDataService::BatchModeScoper scoper(web_data_service_.get()); |
RemoveNoNotify(url); |
- UpdateExtensionDefaultSearchEngine(); |
NotifyObservers(); |
} |
@@ -2460,25 +2455,3 @@ TemplateURL* TemplateURLService::FindMatchingExtensionTemplateURL( |
} |
return nullptr; |
} |
- |
-void TemplateURLService::UpdateExtensionDefaultSearchEngine() { |
- TemplateURL* most_recently_intalled_default = nullptr; |
- for (const auto& turl : template_urls_) { |
- if ((turl->type() == TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION) && |
- turl->extension_info_->wants_to_be_default_engine && |
- turl->SupportsReplacement(search_terms_data()) && |
- (!most_recently_intalled_default || |
- (most_recently_intalled_default->extension_info_->install_time < |
- turl->extension_info_->install_time))) |
- most_recently_intalled_default = turl.get(); |
- } |
- |
- if (most_recently_intalled_default) { |
- base::AutoReset<DefaultSearchChangeOrigin> change_origin( |
- &dsp_change_origin_, DSP_CHANGE_OVERRIDE_SETTINGS_EXTENSION); |
- default_search_manager_.SetExtensionControlledDefaultSearchEngine( |
- most_recently_intalled_default->data()); |
- } else { |
- default_search_manager_.ClearExtensionControlledDefaultSearchEngine(); |
- } |
-} |