diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-31 21:12:17 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-31 21:12:17 +0000 |
| commit | ca5a65fb841e9a155ceae326391fe513fd79998c (patch) | |
| tree | a940e711cba73347a62f778d90a4947ae47e9400 /content/common/sandbox_policy.cc | |
| parent | 7e3763aa34343a94d57dfa60d01d95b9902384a9 (diff) | |
| download | chromium_src-ca5a65fb841e9a155ceae326391fe513fd79998c.zip chromium_src-ca5a65fb841e9a155ceae326391fe513fd79998c.tar.gz chromium_src-ca5a65fb841e9a155ceae326391fe513fd79998c.tar.bz2 | |
Fix Flash sandbox regression from r87093.
BUG=84348
Review URL: http://codereview.chromium.org/7104005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87364 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/sandbox_policy.cc')
| -rw-r--r-- | content/common/sandbox_policy.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/content/common/sandbox_policy.cc b/content/common/sandbox_policy.cc index 2dae0c5..7841120 100644 --- a/content/common/sandbox_policy.cc +++ b/content/common/sandbox_policy.cc @@ -396,7 +396,6 @@ base::ProcessHandle StartProcessWithAccess(CommandLine* cmd_line, !browser_command_line.HasSwitch(switches::kNoSandbox) && content::GetContentClient()->SandboxPlugin(cmd_line, policy)) { in_sandbox = true; - AddDllEvictionPolicy(policy); } if (!in_sandbox) { @@ -405,7 +404,9 @@ base::ProcessHandle StartProcessWithAccess(CommandLine* cmd_line, return process; } - if (type == ChildProcessInfo::GPU_PROCESS) { + if (type == ChildProcessInfo::PLUGIN_PROCESS) { + AddDllEvictionPolicy(policy); + } else if (type == ChildProcessInfo::GPU_PROCESS) { if (!AddPolicyForGPU(cmd_line, policy)) return 0; } else if (type == ChildProcessInfo::PPAPI_PLUGIN_PROCESS) { |