This is a follow-up cleanup for CL https://codereview.webrtc.org/2847383002/. TBR=stefan@webrtc.org Bug: webrtc:7632 Change-Id: I8275e8edbd22b557cdb251f342847f4e8306299c Reviewed-on: https://chromium-review.googlesource.com/524084 Commit-Queue: Magnus Jedvert <magjed@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#18528}