[SEC] Include Play search engine in the list of prepopulated engines on settings screen
This CL adjusts conditions to include search engine from Play API in the
list of prepopulated engines on settings screen. It also adjusts
DefaultSearchManager to propagate created_from_play_api flag through
preferences.
BUG=1002271
R=pkasting@chromium.org,wylieb@chromium.org
Change-Id: I05a1ea866a3b32a0bdf73b3333d1a9258b453941
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1824134
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Kevin Bailey <krb@chromium.org>
Commit-Queue: Pavel Yatsuk <pavely@chromium.org>
Cr-Commit-Position: refs/heads/master@{#700437}
diff --git a/components/search_engines/template_url_service.cc b/components/search_engines/template_url_service.cc
index 60b0948..59ccc3fc 100644
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -364,8 +364,9 @@
bool TemplateURLService::IsPrepopulatedOrCreatedByPolicy(
const TemplateURL* t_url) const {
- return (t_url->prepopulate_id() > 0 || t_url->created_by_policy()) &&
- t_url->SupportsReplacement(search_terms_data());
+ return (t_url->prepopulate_id() > 0 || t_url->created_by_policy() ||
+ t_url->created_from_play_api()) &&
+ t_url->SupportsReplacement(search_terms_data());
}
bool TemplateURLService::ShowInDefaultList(const TemplateURL* t_url) const {