GitLab

This reduces the warnings when running the generator and makes the definitions
more robust (or at least makes it more obvious when someone changes things).

TBR=dmichael@chromium.org

Review URL: http://codereview.chromium.org/8538038

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109817 0039d316-1c4b-4281-b951-d872f2087c98