GitLab

Fix tests that break with --ash-enable-shelf-model-synchronization.
(I'm hoping to imminently enable that functionality by default)

Perform some extra cleanup in chrome_launcher_controller_browsertest.cc
(Fix ShelfModel use, avoid Shelf, nix redundant fixture, add another)

Bug: 557406
Test: Automated
Change-Id: If93c8d0c3ec70f4aa427b5eab2b2c43ffc571158
Reviewed-on: https://chromium-review.googlesource.com/691104
Commit-Queue: Michael Wasserman <msw@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505244}