This propagated into various other places. Also had to #include headers that were implicitly pulled by "scoped_ptr.h". BUG=webrtc:5520 Review URL: https://codereview.webrtc.org/1920043002 Cr-Commit-Position: refs/heads/master@{#12501}
BUG=4838, 4839 Review URL: https://codereview.webrtc.org/1245143005 Cr-Commit-Position: refs/heads/master@{#9628}
BUG=4838 Review URL: https://codereview.webrtc.org/1230823009 Cr-Commit-Position: refs/heads/master@{#9615}