These fixes are needed to avoid errors after submitting https://codereview.webrtc.org/2737963003 BUG=webrtc:7303 NOTRY=True Review-Url: https://codereview.webrtc.org/2812273002 Cr-Commit-Position: refs/heads/master@{#17679}
Mostly just copied from Chromium, replacing instances of "chromium" with "webrtc". BUG=None NOTRY=True Review-Url: https://codereview.webrtc.org/2725233002 Cr-Commit-Position: refs/heads/master@{#16988}