Merge to XFA: Remove dead code found by Scythe.

R=tsepez@chromium.org

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

(cherry picked from commit b05f1fd710496dea44b001bb905fa1c16a39bb28)

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