Index: content/common/sandbox_mac.mm |
diff --git a/content/common/sandbox_mac.mm b/content/common/sandbox_mac.mm |
index 26cad6e63ebad56bbac41b584035fe3e9a261413..105340ed25caaf1954f78b55b84cd40de3c07391 100644 |
--- a/content/common/sandbox_mac.mm |
+++ b/content/common/sandbox_mac.mm |
@@ -410,7 +410,7 @@ bool Sandbox::PostProcessSandboxProfile( |
std::string *final_sandbox_profile_str) { |
NSString* sandbox_data = [[sandbox_template copy] autorelease]; |
- // Remove comments, e.g. ;10.6_ONLY . |
+ // Remove comments, e.g. ;10.7_OR_ABOVE . |
for (NSString* to_remove in comments_to_remove) { |
sandbox_data = [sandbox_data stringByReplacingOccurrencesOfString:to_remove |
withString:@""]; |
@@ -515,13 +515,11 @@ bool Sandbox::EnableSandbox(int sandbox_type, |
[tokens_to_remove addObject:@";ENABLE_LOGGING"]; |
} |
- bool snow_leopard_or_later = base::mac::IsOSSnowLeopardOrLater(); |
bool lion_or_later = base::mac::IsOSLionOrLater(); |
// Without this, the sandbox will print a message to the system log every |
- // time it denies a request. This floods the console with useless spew. The |
- // (with no-log) syntax is only supported on 10.6+ |
- if (snow_leopard_or_later && !enable_logging) { |
+ // time it denies a request. This floods the console with useless spew. |
+ if (!enable_logging) { |
substitutions["DISABLE_SANDBOX_DENIAL_LOGGING"] = |
SandboxSubstring("(with no-log)"); |
} else { |
@@ -543,14 +541,6 @@ bool Sandbox::EnableSandbox(int sandbox_type, |
[tokens_to_remove addObject:@";10.7_OR_ABOVE"]; |
} |
- if (snow_leopard_or_later) { |
- // >=10.6 Sandbox rules. |
- [tokens_to_remove addObject:@";10.6_OR_ABOVE"]; |
- } else { |
- // Sandbox rules only for versions before 10.6. |
- [tokens_to_remove addObject:@";BEFORE_10.6"]; |
- } |
- |
substitutions["COMPONENT_BUILD_WORKAROUND"] = SandboxSubstring(""); |
#if defined(COMPONENT_BUILD) |
// dlopen() fails without file-read-metadata access if the executable image |