Chromium Code Reviews| Index: chrome/browser/zygote_main_linux.cc |
| diff --git a/chrome/browser/zygote_main_linux.cc b/chrome/browser/zygote_main_linux.cc |
| index b03e59c3b19ac92adb2aa6eb576222ad4cf0492c..adb34d385cf0279eb4646b23619e47cc816cd58f 100644 |
| --- a/chrome/browser/zygote_main_linux.cc |
| +++ b/chrome/browser/zygote_main_linux.cc |
| @@ -35,6 +35,7 @@ |
| #include "build/build_config.h" |
| #include "chrome/browser/zygote_host_linux.h" |
| #include "chrome/common/chrome_descriptors.h" |
| +#include "chrome/common/chrome_paths.h" |
| #include "chrome/common/chrome_switches.h" |
| #include "chrome/common/font_config_ipc_linux.h" |
| #include "chrome/common/main_function_params.h" |
| @@ -595,9 +596,12 @@ static void PreSandboxInit() { |
| // cached and there's no more need to access the file system. |
| scoped_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault()); |
| - FilePath module_path; |
| - if (PathService::Get(base::DIR_MODULE, &module_path)) |
| - media::InitializeMediaLibrary(module_path); |
| + // TODO(wez): It doesn't seem right that we CHECK() if we can't load the |
| + // media libraries, but the alternative is to crash when something tries |
| + // to use them. Should we store a flag so code can check this? |
|
scherkus (not reviewing)
2011/02/17 17:57:10
we definitely shouldn't crash!
the renderer proce
|
| + FilePath media_path; |
| + CHECK(PathService::Get(chrome::DIR_MEDIA_LIBS, &media_path)); |
| + CHECK(media::InitializeMediaLibrary(media_path)); |
| // Ensure access to the Pepper plugins before the sandbox is turned on. |
| PepperPluginRegistry::PreloadModules(); |