Revert of https://codereview.chromium.org/120653002/
Reason for revert: Re-land. The speculative revert didn't fix the cros bot.

TBR=acleung@chromium.org,guohui@chromium.org,atwilson@chromium.org,rogerta@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=320351

Review URL: https://codereview.chromium.org/104663011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242376 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 242376