GitLab

This change rearranges the steps of the SortAndCull to ensure the
Matches with Headers are only grouped and demoted after the
GroupBySearchVsURL completes.

This update prevents the GroupBySearchVsURL from pushing the URLs
below the search suggestions, including the matches with group
headers.

Bug: 1165941
Change-Id: I70ea0815ab2c2c8b652368819c2eef1c40f692ef
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2626188Reviewed-by: Moe Ahmadi <mahmadi@chromium.org>
Reviewed-by: Tommy Li <tommycli@chromium.org>
Reviewed-by: Justin Donnelly <jdonnelly@chromium.org>
Commit-Queue: Tomasz Wiszkowski <ender@google.com>
Cr-Commit-Position: refs/heads/master@{#845383}