f715c53bca
This makes it easier to import cleanly downstream, and makes it a lot easier to reason about. Bug: webrtc:6828 Change-Id: I953e129de73053f8619333fe7e318b36e3a1fffa Reviewed-on: https://webrtc-review.googlesource.com/22722 Commit-Queue: Patrik Höglund <phoglund@webrtc.org> Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20727}