| Index: content/test/test_blink_web_unit_test_support.cc
|
| diff --git a/content/test/test_blink_web_unit_test_support.cc b/content/test/test_blink_web_unit_test_support.cc
|
| index 8a6f4fcc62b9007318b734c553a4886d58e46b1d..05a6b9bcce2fec1c48d896fbe7d74c177ba377f5 100644
|
| --- a/content/test/test_blink_web_unit_test_support.cc
|
| +++ b/content/test/test_blink_web_unit_test_support.cc
|
| @@ -127,9 +127,19 @@ TestBlinkWebUnitTestSupport::TestBlinkWebUnitTestSupport() {
|
| blink::WebRuntimeFeatures::enableNotifications(true);
|
| blink::WebRuntimeFeatures::enableTouch(true);
|
|
|
| - // Initialize libraries for media and enable the media player.
|
| - media::InitializeMediaLibrary();
|
| - blink::WebRuntimeFeatures::enableMediaPlayer(true);
|
| + // Load libraries for media and enable the media player.
|
| + bool enable_media = false;
|
| + base::FilePath module_path;
|
| + if (PathService::Get(base::DIR_MODULE, &module_path)) {
|
| +#if defined(OS_MACOSX)
|
| + if (base::mac::AmIBundled())
|
| + module_path = module_path.DirName().DirName().DirName();
|
| +#endif
|
| + if (media::InitializeMediaLibrary(module_path))
|
| + enable_media = true;
|
| + }
|
| + blink::WebRuntimeFeatures::enableMediaPlayer(enable_media);
|
| + LOG_IF(WARNING, !enable_media) << "Failed to initialize the media library.\n";
|
|
|
| file_utilities_.set_sandbox_enabled(false);
|
|
|
|
|