Add short domains to url suggestions when long url is present

[aekeus]

Auditors: @bbondy

Test Plan:

1. Clear history
2. Visit http://www.github.com/brave
3. Verify one history item in about:history
4. Open new tab
5. type 'github'
6. Verify that http://www.github.com suggestion is present

Fixes: #7533
Also fixes #6956

• Submitted a ticket for my issue if one did not already exist.
• Used Github auto-closing keywords in the commit message.
• Added/updated tests for this change (for new code or code which already has tests).
• Ran git rebase -i to squash commits (if needed).

[bbondy]

++