summaryrefslogtreecommitdiffstats
path: root/content/app/content_main_runner.cc
diff options
context:
space:
mode:
Diffstat (limited to 'content/app/content_main_runner.cc')
-rw-r--r--content/app/content_main_runner.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index 315f596..e4f8812 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -282,7 +282,12 @@ int RunZygote(const MainFunctionParams& main_function_params,
ScopedVector<ZygoteForkDelegate> zygote_fork_delegates;
if (delegate) {
delegate->ZygoteStarting(&zygote_fork_delegates);
- media::InitializeMediaLibrary();
+ // Each Renderer we spawn will re-attempt initialization of the media
+ // libraries, at which point failure will be detected and handled, so
+ // we do not need to cope with initialization failures here.
+ base::FilePath media_path;
+ if (PathService::Get(DIR_MEDIA_LIBS, &media_path))
+ media::InitializeMediaLibrary(media_path);
}
// This function call can return multiple times, once per fork().