This CL changes as little as possible and I'll follow up later with ownership of the other members in ChannelGroup. The next step is to remove the id used for channels. BUG=webrtc:5079 Review URL: https://codereview.webrtc.org/1411723002 Cr-Commit-Position: refs/heads/master@{#10318}