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

Unified Diff: content/test/test_blink_web_unit_test_support.cc

Issue 1179953006: [Merge to M44] Chromium changes to statically link ffmpeg. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2403
Patch Set: 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/base/BUILD.gn » ('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 8aa66187af66a49145d8a2c25588f18685f18ad4..52415b02dff636e599f59b5f26ac3922e4fae4f2 100644
--- a/content/test/test_blink_web_unit_test_support.cc
+++ b/content/test/test_blink_web_unit_test_support.cc
@@ -126,19 +126,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/base/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698