Intended to ease further refactoring, cleanup and deletion in this code. Bug: webrtc:8830 Change-Id: Ib862b073e93b67b4f8eedbbf40ad3a8354a566a2 Reviewed-on: https://webrtc-review.googlesource.com/55562 Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> Commit-Queue: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22120}