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 29a06edce379fba99cde94c2a2966d280930b637..d8bb13d4a07e8806e616c2a29cc8ebfcd1fdcd4a 100644 |
--- a/components/search_engines/template_url_service.cc |
+++ b/components/search_engines/template_url_service.cc |
@@ -1642,8 +1642,8 @@ bool TemplateURLService::CanAddAutogeneratedKeywordForHost( |
} |
bool TemplateURLService::CanReplace(const TemplateURL* t_url) { |
- return (t_url != default_search_provider_ && !t_url->show_in_default_list() && |
- t_url->safe_for_autoreplace()); |
+ return (t_url != default_search_provider_ && t_url->prepopulate_id() <= 0 && |
+ !t_url->created_by_policy() && t_url->safe_for_autoreplace()); |
} |
TemplateURL* TemplateURLService::FindNonExtensionTemplateURLForKeyword( |
@@ -2114,7 +2114,6 @@ bool TemplateURLService::ResetTemplateURLNoNotify( |
void TemplateURLService::NotifyObservers() { |
if (!loaded_) |
return; |
- |
FOR_EACH_OBSERVER(TemplateURLServiceObserver, model_observers_, |
OnTemplateURLServiceChanged()); |
} |