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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/html_viewer/media_factory.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 | « components/components_unittests.isolate ('k') | content/app/content_main_runner.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/html_viewer/media_factory.cc
diff --git a/components/html_viewer/media_factory.cc b/components/html_viewer/media_factory.cc
index 101015a80c218bc025c5a0fad1fdad863e5ec2a5..29a153bcdb920372431b29e62ce52283f9d09e67 100644
--- a/components/html_viewer/media_factory.cc
+++ b/components/html_viewer/media_factory.cc
@@ -88,11 +88,7 @@ MediaFactory::MediaFactory(
->HasSwitch(kEnableMojoMediaRenderer)),
compositor_task_runner_(compositor_task_runner),
shell_(shell) {
- if (!media::IsMediaLibraryInitialized()) {
- base::FilePath module_dir;
- CHECK(PathService::Get(base::DIR_EXE, &module_dir));
- CHECK(media::InitializeMediaLibrary(module_dir));
- }
+ media::InitializeMediaLibrary();
}
MediaFactory::~MediaFactory() {
« no previous file with comments | « components/components_unittests.isolate ('k') | content/app/content_main_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698