ONC: Cleanup client certificate related fields.

components/onc/onc_constants.h

Index: components/onc/onc_constants.h
diff --git a/components/onc/onc_constants.h b/components/onc/onc_constants.h
index df815c6d7f592d7ec3281eca01ceb8c8af4a4d86..8a240ca4e2a5c6bb056845cde031565e50a0c244 100644
--- a/components/onc/onc_constants.h
+++ b/components/onc/onc_constants.h
@@ -157,8 +157,8 @@ ONC_EXPORT extern const char kType[];
 
 namespace ethernet {
 ONC_EXPORT extern const char kAuthentication[];
+ONC_EXPORT extern const char kAuthenticationNone[];
 ONC_EXPORT extern const char kEAP[];
-ONC_EXPORT extern const char kNone[];
 ONC_EXPORT extern const char k8021X[];
 }  // namespace ethernet
 
@@ -169,11 +169,11 @@ ONC_EXPORT extern const char kEAP[];
 ONC_EXPORT extern const char kFrequency[];
 ONC_EXPORT extern const char kFrequencyList[];
 ONC_EXPORT extern const char kHiddenSSID[];
-ONC_EXPORT extern const char kNone[];
 ONC_EXPORT extern const char kPassphrase[];
 ONC_EXPORT extern const char kProxyURL[];
 ONC_EXPORT extern const char kSSID[];
 ONC_EXPORT extern const char kSecurity[];
+ONC_EXPORT extern const char kSecurityNone[];
 ONC_EXPORT extern const char kSignalStrength[];
 ONC_EXPORT extern const char kWEP_PSK[];
 ONC_EXPORT extern const char kWEP_8021X[];
@@ -182,13 +182,13 @@ ONC_EXPORT extern const char kWPA2_PSK[];
 ONC_EXPORT extern const char kWPA_EAP[];
 }  // namespace wifi
 
-namespace certificate {
-ONC_EXPORT extern const char kAuthority[];
-ONC_EXPORT extern const char kClient[];
+namespace client_cert {
+ONC_EXPORT extern const char kClientCertPattern[];
+ONC_EXPORT extern const char kClientCertRef[];
+ONC_EXPORT extern const char kClientCertType[];
 ONC_EXPORT extern const char kCommonName[];
 ONC_EXPORT extern const char kEmailAddress[];
 ONC_EXPORT extern const char kEnrollmentURI[];
-ONC_EXPORT extern const char kGUID[];
 ONC_EXPORT extern const char kIssuerCARef[];
 ONC_EXPORT extern const char kIssuerCAPEMs[];
 ONC_EXPORT extern const char kIssuer[];
@@ -196,11 +196,17 @@ ONC_EXPORT extern const char kLocality[];
 ONC_EXPORT extern const char kNone[];

[stevenjb, 2014/07/07 19:19:14]

nit: kClientCertNone?

[pneubeck (no reviews), 2014/07/08 09:14:37]

Done.

 ONC_EXPORT extern const char kOrganization[];
 ONC_EXPORT extern const char kOrganizationalUnit[];
-ONC_EXPORT extern const char kPKCS12[];
 ONC_EXPORT extern const char kPattern[];
 ONC_EXPORT extern const char kRef[];
-ONC_EXPORT extern const char kServer[];
 ONC_EXPORT extern const char kSubject[];
+}  // namespace client_cert
+
+namespace certificate {
+ONC_EXPORT extern const char kAuthority[];
+ONC_EXPORT extern const char kClient[];
+ONC_EXPORT extern const char kGUID[];
+ONC_EXPORT extern const char kPKCS12[];
+ONC_EXPORT extern const char kServer[];
 ONC_EXPORT extern const char kTrustBits[];
 ONC_EXPORT extern const char kType[];
 ONC_EXPORT extern const char kWeb[];
@@ -224,9 +230,6 @@ ONC_EXPORT extern const char kStretch[];
 namespace eap {
 ONC_EXPORT extern const char kAnonymousIdentity[];
 ONC_EXPORT extern const char kAutomatic[];
-ONC_EXPORT extern const char kClientCertPattern[];
-ONC_EXPORT extern const char kClientCertRef[];
-ONC_EXPORT extern const char kClientCertType[];
 ONC_EXPORT extern const char kEAP_AKA[];
 ONC_EXPORT extern const char kEAP_FAST[];
 ONC_EXPORT extern const char kEAP_SIM[];
@@ -250,9 +253,6 @@ ONC_EXPORT extern const char kUseSystemCAs[];
 
 namespace vpn {
 ONC_EXPORT extern const char kAutoConnect[];
-ONC_EXPORT extern const char kClientCertPattern[];
-ONC_EXPORT extern const char kClientCertRef[];
-ONC_EXPORT extern const char kClientCertType[];
 ONC_EXPORT extern const char kHost[];
 ONC_EXPORT extern const char kIPsec[];
 ONC_EXPORT extern const char kL2TP[];