GitLab

This reverts commit ed15ce53.

Previous change prevented promos and search suggestions from appearing properly.

Required manual resolution for merge conflicts.

Bug: 770640
Change-Id: I37add613a23567d57912623c02441cdb68d261e0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1507249
Commit-Queue: Kyle Milka <kmilka@chromium.org>
Reviewed-by: Kristi Park <kristipark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#638638}