Reduce number of unnamed-type-template-args violations.

net/base/x509_cert_types_mac.cc

 // Copyright (c) 2010 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/x509_cert_types.h"
 
 #include <CoreServices/CoreServices.h>
 #include <Security/Security.h>
 #include <Security/SecAsn1Coder.h>
 
@@ skipping 18 matching lines @@
 
 // The following structs and templates work with Apple's very arcane and under-
 // documented SecAsn1Parser API, which is apparently the same as NSS's ASN.1
 // decoder:
 // http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn1.html
 
 // These are used to parse the contents of a raw
 // BER DistinguishedName structure.
 
 struct KeyValuePair {
-  CSSM_OID key;
-  int value_type;
-  CSSM_DATA value;
-
-  enum {
+  enum ValueType {
     kTypeOther = 0,
     kTypePrintableString,
     kTypeIA5String,
     kTypeT61String,
     kTypeUTF8String,
     kTypeBMPString,
     kTypeUniversalString,
   };
+
+  CSSM_OID key;
+  ValueType value_type;
+  CSSM_DATA value;
 };
 
 const SecAsn1Template kStringValueTemplate[] = {
   { SEC_ASN1_CHOICE, offsetof(KeyValuePair, value_type), },
   { SEC_ASN1_PRINTABLE_STRING,
     offsetof(KeyValuePair, value), 0, KeyValuePair::kTypePrintableString },
   { SEC_ASN1_IA5_STRING,
     offsetof(KeyValuePair, value), 0, KeyValuePair::kTypeIA5String },
   { SEC_ASN1_T61_STRING,
     offsetof(KeyValuePair, value), 0, KeyValuePair::kTypeT61String },
@@ skipping 240 matching lines @@
       match(locality_name, against.locality_name) &&
       match(state_or_province_name, against.state_or_province_name) &&
       match(country_name, against.country_name) &&
       match(street_addresses, against.street_addresses) &&
       match(organization_names, against.organization_names) &&
       match(organization_unit_names, against.organization_unit_names) &&
       match(domain_components, against.domain_components);
 }
 
 }  // namespace net