Revert of https://codereview.chromium.org/109783003/
Reason for revert: ChromeOS bot failures, example http://build.chromium.org/p/chromium.chromiumos/builders/ChromiumOS%20%28x86%29/builds/19049

Failing lines:
/tmp/cbuildbotBRIADJ/test_harness/all/SimpleTestVerify/1_autotest_tests/results-16-login_CryptohomeTelemetry                                   [  FAILED  ]
/tmp/cbuildbotBRIADJ/test_harness/all/SimpleTestVerify/1_autotest_tests/results-16-login_CryptohomeTelemetry                                     FAIL: TabCrashException('Received a socket error in the browser connection and the tab no longer exists, assuming it crashed. Error=timed out',)
/tmp/cbuildbotBRIADJ/test_harness/all/SimpleTestVerify/1_autotest_tests/results-16-login_CryptohomeTelemetry/login_CryptohomeTelemetry         [  FAILED  ]
/tmp/cbuildbotBRIADJ/test_harness/all/SimpleTestVerify/1_autotest_tests/results-16-login_CryptohomeTelemetry/login_CryptohomeTelemetry           FAIL: TabCrashException('Received a socket error in the browser connection and the tab no longer exists, assuming it crashed. Error=timed out',)


TBR=joi@chromium.org,rogerta@chromium.org,tfarina@chromium.org,thakis@chromium.org,blundell@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=332107

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

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