GitLab

This is effectively a pared-down version of the already reviewed:
http://codereview.chromium.org/6308014/
BUG=none
TEST=none
(tested locally for Mac OS X which is the only platform this affects)

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