Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1154)

Unified Diff: content/test/test_blink_web_unit_test_support.cc

Issue 1141703002: Chromium changes for static linking ffmpeg (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Roll DEPS to fix cros, rebase. Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/test/content_test_suite.cc ('k') | media/audio_unittests.isolate » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 07391373019df8c74ea41870aca961fbb20dada4..177f7d6a98c38d5cb7d10363530ab004b1999b32 100644
--- a/content/test/test_blink_web_unit_test_support.cc
+++ b/content/test/test_blink_web_unit_test_support.cc
@@ -129,19 +129,9 @@ TestBlinkWebUnitTestSupport::TestBlinkWebUnitTestSupport() {
blink::WebRuntimeFeatures::enableNotifications(true);
blink::WebRuntimeFeatures::enableTouch(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";
+ // Initialize libraries for media and enable the media player.
+ media::InitializeMediaLibrary();
+ blink::WebRuntimeFeatures::enableMediaPlayer(true);
file_utilities_.set_sandbox_enabled(false);
« no previous file with comments | « content/test/content_test_suite.cc ('k') | media/audio_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698