GitLab

This is bryeung CL from http://codereview.chromium.org/8748013/
which was approved by sky and failed on the commit-bot. It also improves the logic of one of my later CL in the same area.

TBR=sky@chromium.org
BUG=105046
TEST=grep *.ninja for relevant files in a large variety of configurations


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

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