Merge to XFA: Convert some unneeded gotos into returns.

R=tsepez@chromium.org
TBR=tsepez@chromium.org

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

(cherry picked from commit da0938f8671958aba0522a69fc687a7bbb01b435)

Review URL: https://codereview.chromium.org/1350453002 .
1 file changed