Revert Aura changes

This reverts commits r120044 and r120053. '044 broke the Win Aura bot, '053 did not fix it, and it's been burning since.

BUG=
TEST=

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

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