This CL cleans up parts from https://codereview.webrtc.org/2939203002/. Bug: webrtc:7613 Change-Id: I96d1a2cc91174f43d3cae2cb41b2e0fe7142e3e9 Reviewed-on: https://chromium-review.googlesource.com/539456 Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> Commit-Queue: Magnus Jedvert <magjed@webrtc.org> Cr-Commit-Position: refs/heads/master@{#18665}