GitLab

For now the chrome module's manifest is merged into the base manifest to
match the expectations files we have. If the chrome module launches, we
may want to have more checks on what gets put in the base manifest vs.
the chrome manifest.

Bug: 1151529
Change-Id: I786175aec33cf5f454a416d3f51e9dd069dbac82
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2572792Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#833591}