Revert of https://codereview.chromium.org/110013007/
Reason for revert: This CL is causing crbug.com/331773. We intentionally leave the codepath for android in https://chromiumcodereview.appspot.com/11742017.

TBR=jam@chromium.org
NOTREECHECKS=true
NOTRY=true

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

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