GitLab

Currently, prepopulated engines don't outrank other autogenerated
engines, and that was a contributory factory in the bug linked below
that clobbered users' default search engines on Canary.

This CL fixes that problem, and adds a test that fails before this CL,
and passes afterwards. (To prevent this condition from regressing.)

After this CL there will be more follow-on work to make sure we never
remove prepopulated engines during any deduplication.

This CL also incidentally improves some naming consistency among our
unit tests.

Bug: 1164024
Change-Id: I6f90668abad02ae53adfbd0c8c739e07247a4a7b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2617865
Commit-Queue: Tommy Li <tommycli@chromium.org>
Reviewed-by: Orin Jaworski <orinj@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#842158}