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= Review URL: https://codereview.webrtc.org/1696673003 Cr-Commit-Position: refs/heads/master@{#11872}
BUG= Review URL: https://codereview.webrtc.org/1649533002 Cr-Commit-Position: refs/heads/master@{#11409}
BUG= Review URL: https://codereview.webrtc.org/1616303002 Cr-Commit-Position: refs/heads/master@{#11386}