This CL fixes a comment that has the wrong format, and takes over ownership of an orphaned todo. It also removes some unneeded code from ObjC classes and moves them to a style more fitting the rest of the codebase. BUG=None Review-Url: https://codereview.webrtc.org/2777453003 Cr-Commit-Position: refs/heads/master@{#17416}