[omnibox] Prefer entity suggestions when deduping.

Changes the deduping logic in AutocompleteResult to choose entity
suggestions over non-entity suggestions, even if they have a lower
score. If they do have a lower score, promotes their score to that
of the higher-scoring non-entity suggestion.

Bug: 913299
Change-Id: I6197a216af0d4a6ca420acd34702ddbe14458c41
Reviewed-on: https://chromium-review.googlesource.com/c/1356016
Commit-Queue: Justin Donnelly <jdonnelly@chromium.org>
Reviewed-by: Kevin Bailey <krb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#615032}
2 files changed