4b9a2cb0d8
The earlier attempt of this was in https://codereview.webrtc.org/2411613002/ It was reverted due to failures on internal bots, showing that we cannot deprecate one method. BUG=webrtc:6303 Review-Url: https://codereview.webrtc.org/2538493006 Cr-Commit-Position: refs/heads/master@{#15333}