GitLab

This basically a revert of r112435 except that the test
remains active.

   original CL: http://codereview.chromium.org/8735016

BUG=103497
TEST=browser_tests should stay green.


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

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