Fix compilation on windows with clang, indentation cleanups

R=henrike@webrtc.org, thakis@chromium.org
TBR=hellner@chromium.org

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

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