More cleanup of MSVC errors

Review URL: http://codereview.chromium.org/2871019
6 files changed