base: Renaming + conforming: post commit review changes for https://webrtc-codereview.appspot.com/17699005/

BUG=N/A
R=niklas.enbom@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/20709004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6467 4adac7df-926f-26a2-2b94-8c16560cd09d