GitLab

This CL adjusts logic in TemplateUrlServiceAndroid::SetPlayAPISearchEngine
to merge search engine data when search engine with matchiung keyword
already exists.

Additionally this CL adjusts merging logic during prepopulated list
update to preserve Play API search engine data. This is important since
search url might contain attribution parameters. We might decide to take
different approach with providing attribution info, but before that
happens preserving Play API data is the safest approach.

BUG=1002271
R=pkasting@chromium.org,wylieb@chromium.org

Change-Id: I596a6df724cfc73801663ca7d97074ba69e856c7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1838534
Commit-Queue: Pavel Yatsuk <pavely@chromium.org>
Reviewed-by: Kevin Bailey <krb@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703394}