Fix style errors found by cpplint.

R=etienne.bergeron@gmail.com

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