GitLab

This makes sure DFM resources are merged even when the chrome module is
disabled.

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