Do not perform online revocation checking when the user has explicitly disabled it, except for when…

net/base/ev_root_ca_metadata.cc

 // Copyright (c) 2012 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 "net/base/ev_root_ca_metadata.h"
 
 #if defined(USE_NSS)
 #include <cert.h>
 #include <pkcs11n.h>
 #include <secerr.h>
@@ skipping 302 matching lines @@
 
 static base::LazyInstance<EVRootCAMetadata>::Leaky
     g_ev_root_ca_metadata = LAZY_INSTANCE_INITIALIZER;
 
 // static
 EVRootCAMetadata* EVRootCAMetadata::GetInstance() {
   return g_ev_root_ca_metadata.Pointer();
 }
 
 #if defined(USE_NSS)
+bool EVRootCAMetadata::IsEVPolicyOID(PolicyOID policy_oid) const {
+  return policy_oids_.find(policy_oid) != policy_oids_.end();
+}
 
-bool EVRootCAMetadata::GetPolicyOIDsForCA(
+bool EVRootCAMetadata::HasEVPolicyOID(
     const SHA1Fingerprint& fingerprint,
-    std::vector<PolicyOID>* policy_oids) const {
+    PolicyOID policy_oid) const {
   PolicyOIDMap::const_iterator iter = ev_policy_.find(fingerprint);
   if (iter == ev_policy_.end())
     return false;
   for (std::vector<PolicyOID>::const_iterator
        j = iter->second.begin(); j != iter->second.end(); ++j) {
-    policy_oids->push_back(*j);
+    if (*j == policy_oid)
+      return true;
   }
-  return true;
-}
-
-const EVRootCAMetadata::PolicyOID* EVRootCAMetadata::GetPolicyOIDs() const {
-  return &policy_oids_[0];
-}
-
-int EVRootCAMetadata::NumPolicyOIDs() const {
-  return policy_oids_.size();
+  return false;
 }
 
 bool EVRootCAMetadata::AddEVCA(const SHA1Fingerprint& fingerprint,
                                const char* policy) {
   if (ev_policy_.find(fingerprint) != ev_policy_.end())
     return false;
 
   PolicyOID oid;
   if (!RegisterOID(policy, &oid))
     return false;
 
   ev_policy_[fingerprint].push_back(oid);
-  policy_oids_.push_back(oid);
+  policy_oids_.insert(oid);
 
   return true;
 }
 
 bool EVRootCAMetadata::RemoveEVCA(const SHA1Fingerprint& fingerprint) {
   PolicyOIDMap::iterator it = ev_policy_.find(fingerprint);
   if (it == ev_policy_.end())
     return false;
   PolicyOID oid = it->second[0];
   ev_policy_.erase(it);
-
-  std::vector<PolicyOID>::iterator it2 = std::find(
-      policy_oids_.begin(), policy_oids_.end(), oid);
-  if (it2 == policy_oids_.end())
-    return false;
-  policy_oids_.erase(it2);
+  policy_oids_.erase(oid);
   return true;
 }
 
 // static
 bool EVRootCAMetadata::RegisterOID(const char* policy,
                                    PolicyOID* out) {
   PRUint8 buf[64];
   SECItem oid_item;
   oid_item.data = buf;
   oid_item.len = sizeof(buf);
@@ skipping 102 matching lines @@
         break;
       const char* policy_oid = metadata.policy_oids[j];
 
       PolicyOID policy;
       if (!RegisterOID(policy_oid, &policy)) {
         LOG(ERROR) << "Failed to register OID: " << policy_oid;
         continue;
       }
 
       ev_policy_[metadata.fingerprint].push_back(policy);
-      policy_oids_.push_back(policy);
+      policy_oids_.insert(policy);
     }
   }
 #endif
 }
 
 EVRootCAMetadata::~EVRootCAMetadata() { }
 
 }  // namespace net