Merge to XFA: Fix -Winconsistent-missing-override warnings.

R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1187463003.

(cherry picked from commit 8bd09648445aef8a9ae38d9f61618bd2013ac3f0)

Review URL: https://codereview.chromium.org/1194173002.
2 files changed