BUG=60215
TEST=test_shell_tests,media_unittests

Review URL: http://codereview.chromium.org/7823005

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