| Index: content/app/content_main_runner.cc
|
| diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
|
| index 315f596422d40b9049264b1376967db1da8558a3..e4f8812db56671c6996adc5f70bf2ad5ed1cd42c 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().
|
|
|