ONC: Cleanup client certificate related fields.

Before, each network type had its own constants for ClientCert{Type,Pattern,Ref} which lead to duplicate implementations.

These constants are now unified into the namespace onc::client_cert together with the other client certificate related constants.

This leads to a clearer separation from the Certificate ONC object (has namespace onc::certificate)
and simplifies some code (see network_ui_data.cc and onc_validator.cc).

BUG=391292
(For trivial constant renaming:)
TBR=mef@chromium.org,vitalybuka@chromium.org

Review URL: https://codereview.chromium.org/368233004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281820 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 15 insertions, 15 deletions

diff --git a/components/onc/onc_constants.h b/components/onc/onc_constants.h
index df815c6..e3db4d7 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,25 +182,31 @@ 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 kClientCertTypeNone[];
 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[];
 ONC_EXPORT extern const char kLocality[];
-ONC_EXPORT extern const char kNone[];
 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[];