| Index: chrome/browser/zygote_main_linux.cc
|
| diff --git a/chrome/browser/zygote_main_linux.cc b/chrome/browser/zygote_main_linux.cc
|
| index 51a658ef3bae9ae13fc4296bc5da3dbae4d67be8..fa0cbba8bd9b569a09ac93190c37343c5e48989c 100644
|
| --- a/chrome/browser/zygote_main_linux.cc
|
| +++ b/chrome/browser/zygote_main_linux.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2009 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -36,6 +36,7 @@
|
| #include "chrome/common/chrome_descriptors.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/main_function_params.h"
|
| +#include "chrome/common/pepper_plugin_registry.h"
|
| #include "chrome/common/process_watcher.h"
|
| #include "chrome/common/sandbox_methods_linux.h"
|
|
|
| @@ -546,6 +547,9 @@ static void PreSandboxInit() {
|
| FilePath module_path;
|
| if (PathService::Get(base::DIR_MODULE, &module_path))
|
| media::InitializeMediaLibrary(module_path);
|
| +
|
| + // Ensure access to the Pepper plugins before the sandbox is turned on.
|
| + PepperPluginRegistry::PreloadModules();
|
| }
|
|
|
| #if !defined(CHROMIUM_SELINUX)
|
|
|