Merge to XFA: Fix four annoying warnings.

Original Review URL: https://codereview.chromium.org/1148353002

R=thestig@chromium.org
TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1150103002
3 files changed