Fix more coding style issues.

R=fdoray@chromium.org

BUG=

Review URL: https://codereview.appspot.com/18030043