Fix a few header order violations

2 real violations were masked by skipping check-webkit-style in this CL:
Manually commit changes that cause false-alarm on check-webkit-style.
https://codereview.chromium.org/330323005/

This fixes them.

BUG=381876
R=haraken

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

git-svn-id: svn://svn.chromium.org/blink/trunk@176384 bbb929c8-8fbe-4397-9dbb-9b2b20218538