Chrome Version: 56.0.2897.0
OS: macOS 10.13.3

What steps will reproduce the problem?
(1) Bring up the cookies dialog.
(2) Click the omnibox.
(3) Click the cookies dialog.

optional:
(4) Click another browser window to make it active.
(5) Use cmd+` to switch back to the first browser window.

What is the expected result?
- At (3), the omnibox should lose its active appearance.
- At (5), the dialog should have keyboard focus, not the omnibox.

What happens instead?
- At (3), the omnibox still appears active.
- At (5), the omnibox gets focus.

This is left over from  issue 658405 . Fixing it without breaking a bunch of tests proved tricky.