Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1317)

Unified Diff: content/common/sandbox_policy.cc

Issue 11049004: Remove Legacy NPAPI Flash Sandbox support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/common/sandbox_policy.cc
===================================================================
--- content/common/sandbox_policy.cc (revision 159496)
+++ content/common/sandbox_policy.cc (working copy)
@@ -707,18 +707,9 @@
// to create separate pretetch settings for browser, renderer etc.
cmd_line->AppendArg(base::StringPrintf("/prefetch:%d", type));
- sandbox::ResultCode result;
base::win::ScopedProcessInformation target;
sandbox::TargetPolicy* policy = g_broker_services->CreatePolicy();
-#if !defined(NACL_WIN64) // We don't need this code on win nacl64.
- if (type == content::PROCESS_TYPE_PLUGIN &&
- !browser_command_line.HasSwitch(switches::kNoSandbox) &&
- content::GetContentClient()->SandboxPlugin(cmd_line, policy)) {
- in_sandbox = true;
- }
-#endif
-
if (!in_sandbox) {
cpu_(ooo_6.6-7.5) 2012/10/04 17:46:40 we don't need to create policy (line 711) and then
jschuh 2012/10/04 22:14:53 Done.
policy->Release();
base::ProcessHandle process = 0;
@@ -755,10 +746,7 @@
if (policy->SetDelayedProcessMitigations(mitigations) != sandbox::SBOX_ALL_OK)
return 0;
- if (type == content::PROCESS_TYPE_PLUGIN) {
- AddGenericDllEvictionPolicy(policy);
- AddPluginDllEvictionPolicy(policy);
- } else if (type == content::PROCESS_TYPE_GPU) {
+ if (type == content::PROCESS_TYPE_GPU) {
if (!AddPolicyForGPU(cmd_line, policy))
return 0;
} else {
@@ -787,6 +775,7 @@
}
}
+ sandbox::ResultCode result;
if (!exposed_dir.empty()) {
result = policy->AddRule(sandbox::TargetPolicy::SUBSYS_FILES,
sandbox::TargetPolicy::FILES_ALLOW_ANY,

Powered by Google App Engine
This is Rietveld 408576698