Merge to XFA: Remove some dead code.

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

(cherry picked from commit 38f5c338fdc2daf79668cf7567298d9f62e4ba23)

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