GitLab

Relanding go/chromium-cl/1145892 with the fix.

This reverts commit 3f6d2857.

Bug: b/111694183
Test: Numerous runs of cast_media_unittest
Change-Id: I46dd922bd99e8a957d90446cfcebd56f405fdc0f
Reviewed-on: https://chromium-review.googlesource.com/1153504Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Aidan Wolter <awolter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#578798}