Make BootstrapSandboxPolicy a struct, containing the existing rule map and a new default rule.

sandbox/mac/policy.cc

 // Copyright 2014 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.
 
 #include "sandbox/mac/policy.h"
 
 namespace sandbox {
 
 Rule::Rule()
     : result(POLICY_DECISION_INVALID),
       substitute_port(MACH_PORT_NULL) {
 }
 
 Rule::Rule(PolicyDecision result)
     : result(result),
       substitute_port(MACH_PORT_NULL) {
 }
 
 Rule::Rule(mach_port_t override_port)
     : result(POLICY_SUBSTITUTE_PORT),
       substitute_port(override_port) {
 }
 
-bool IsPolicyValid(const BootstrapSandboxPolicy& policy) {
-  for (BootstrapSandboxPolicy::const_iterator it = policy.begin();
-       it != policy.end();
-       ++it) {
-    const Rule& rule = it->second;
-    if (!(rule.result > POLICY_DECISION_INVALID &&
-          rule.result < POLICY_DECISION_LAST)) {
+BootstrapSandboxPolicy::BootstrapSandboxPolicy()
+    : default_rule(POLICY_DENY_ERROR) {
+}
+
+BootstrapSandboxPolicy::~BootstrapSandboxPolicy() {}
+
+static bool IsRuleValid(const Rule& rule) {
+  if (!(rule.result > POLICY_DECISION_INVALID &&
+        rule.result < POLICY_DECISION_LAST)) {
+    return false;
+  }
+  if (rule.result == POLICY_SUBSTITUTE_PORT) {
+    if (rule.substitute_port == MACH_PORT_NULL)
       return false;
-    }
-    if (rule.result == POLICY_SUBSTITUTE_PORT) {
-      if (rule.substitute_port == MACH_PORT_NULL)
-        return false;
-    } else {
-      if (rule.substitute_port != MACH_PORT_NULL)
-        return false;
-    }
+  } else {
+    if (rule.substitute_port != MACH_PORT_NULL)
+      return false;
   }
   return true;
 }
+
+bool IsPolicyValid(const BootstrapSandboxPolicy& policy) {
+  if (!IsRuleValid(policy.default_rule))
+    return false;
+
+  for (BootstrapSandboxPolicy::NamedRules::const_iterator it =

[Mark Mentovai, 2014/06/03 16:57:27]

You can just write "for (const auto& kv : policy.rules)" now (or if you don’t
like auto, you can use “const BootstrapSandboxPolicy::NamedRules::value_type&”
or “const std::pair<std::string, Rule>&”.

[Robert Sesek, 2014/06/03 17:30:52]

I like const auto&.

+           policy.rules.begin();
+       it != policy.rules.end();
+       ++it) {
+    if (!IsRuleValid(it->second))
+      return false;
+  }
+  return true;
+}
 
 }  // namespace sandbox