Revert of https://codereview.chromium.org/119913003/
Reason for revert: Broke ComponentUpdaterTest on Android. Need to update expectations.

TBR=cpu@chromium.org,thakis@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=116838

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

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