GitLab

This continues refactoring started in http://codereview.chromium.org/9958006/

BUG=None
TEST=Refactor; covered by existing tests


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

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