commit 6a1f9cfe6a7612767f344f7fd5ffcc77d94d1515
author dalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu May 24 21:23:45 2012
committer dalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu May 24 21:23:45 2012
tree b7e1aba7a510df46dff92faf7bfd2d1df2f5fa03
parent 46553dea4f7698a2e08f210c64ff6957766a9b2d

Disable WebAudio when media library init fails.

WebAudio uses the media library but doesn't check if init
fails leading to a crash when the media library is called.

BUG=129436
TEST=Skip media library load, observed no crash after fix.


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

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

content/renderer/render_thread_impl.cc

diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index ca8033e8..3f6756a1 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -558,7 +558,8 @@
       command_line.HasSwitch(switches::kEnableEncryptedMedia));
 
   WebRuntimeFeatures::enableWebAudio(
-      !command_line.HasSwitch(switches::kDisableWebAudio));
+      !command_line.HasSwitch(switches::kDisableWebAudio) &&
+      media::IsMediaLibraryInitialized());
 
   WebRuntimeFeatures::enablePushState(true);