GitLab

Fixes small conflict after crrev.com/c/1036524.

Bug: None
Test: cast_media_unittests
Change-Id: Ib0a83c0074c6f9f7b9532cefe10c7331ec11e645
Reviewed-on: https://chromium-review.googlesource.com/1160932
Commit-Queue: Aidan Wolter <awolter@chromium.org>
Reviewed-by: Kenneth MacKay <kmackay@chromium.org>
Cr-Commit-Position: refs/heads/master@{#580251}