My previous attempt at preferring entity suggestions ( bug 913299 ) had a limitation in that it only worked when the entity suggestion was allowed_to_be_default_match. This often worked because of a related change I made (https://crrev.com/c/1376318) that set this value on entity suggestions if they matched the previous cycle's top match. But we could still fail to prefer entity suggestions if they didn't fall under this case.

However, the intent is that entity suggestions should always be preferred over an equivalent non-entity suggestion. Equivalent is defined as: has the same stripped destination URL and has the same fill_into_edit.

In order to do this, it will also be necessary to set allowed_to_be_default_match to true on all entity suggestions selected during the deduping process, if any of the other candidate matches being deduped has this value, to avoid re-introducing a version of bug 542780.