Revert "Fix compilation on windows with clang, indentation cleanups"

This reverts commit f628eaedfeea97e13c63c78dd42f2b1c76723619.

TBR=sergeyu@chromium.org

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

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