GitLab

This CL restores two other previously reverted commits, with a fix:
* 30750caa
  [omnibox] Refactor ViewViews to not directly set PopupModel state

* 80f05db7
  [omnibox] Add unit test for popup model StepSelection

The fix resolves the unit test that was failing around keyword mode.
Instead of having the view manage both popup_model and edit_model
with complex logic, all the model changes are moved into StepSelection.

Change-Id: Ia1ff449d780e5beddf4208b8bc1c58f98c1dc7fe
Bug: 1046523
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2131021Reviewed-by: Tommy Li <tommycli@chromium.org>
Commit-Queue: Orin Jaworski <orinj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#755209}