Revert r113405, since it appears to be causing a crash and a hang. Also reverted r118506 since it is no longer applicable.

BUG=109876, 110368, 62364, 92244

Review URL: https://chromiumcodereview.appspot.com/9226039

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