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

2 files changed, 30 insertions, 30 deletions

diff --git a/components/onc/onc_constants.cc b/components/onc/onc_constants.cc
index 5ca272b..57df38e 100644
--- a/components/onc/onc_constants.cc
+++ b/components/onc/onc_constants.cc
@@ -129,8 +129,8 @@ const char kNotConnected[] = "NotConnected";
 
 namespace ethernet {
 const char kAuthentication[] = "Authentication";
+const char kAuthenticationNone[] = "None";
 const char kEAP[] = "EAP";
-const char kNone[] = "None";
 const char k8021X[] = "8021X";
 }  // namespace ethernet
 
@@ -151,11 +151,11 @@ const char kEAP[] = "EAP";
 const char kFrequency[] = "Frequency";
 const char kFrequencyList[] = "FrequencyList";
 const char kHiddenSSID[] = "HiddenSSID";
-const char kNone[] = "None";
 const char kPassphrase[] = "Passphrase";
 const char kProxyURL[] = "ProxyURL";
 const char kSSID[] = "SSID";
 const char kSecurity[] = "Security";
+const char kSecurityNone[] = "None";
 const char kSignalStrength[] = "SignalStrength";
 const char kWEP_8021X[] = "WEP-8021X";
 const char kWEP_PSK[] = "WEP-PSK";
@@ -164,25 +164,31 @@ const char kWPA_PSK[] = "WPA-PSK";
 const char kWPA2_PSK[] = "WPA2-PSK";
 }  // namespace wifi
 
-namespace certificate {
-const char kAuthority[] = "Authority";
-const char kClient[] = "Client";
+namespace client_cert {
+const char kClientCertPattern[] = "ClientCertPattern";
+const char kClientCertRef[] = "ClientCertRef";
+const char kClientCertType[] = "ClientCertType";
+const char kClientCertTypeNone[] = "None";
 const char kCommonName[] = "CommonName";
 const char kEmailAddress[] = "EmailAddress";
 const char kEnrollmentURI[] = "EnrollmentURI";
-const char kGUID[] = "GUID";
 const char kIssuerCARef[] = "IssuerCARef";
 const char kIssuerCAPEMs[] = "IssuerCAPEMs";
 const char kIssuer[] = "Issuer";
 const char kLocality[] = "Locality";
-const char kNone[] = "None";
 const char kOrganization[] = "Organization";
 const char kOrganizationalUnit[] = "OrganizationalUnit";
-const char kPKCS12[] = "PKCS12";
 const char kPattern[] = "Pattern";
 const char kRef[] = "Ref";
-const char kServer[] = "Server";
 const char kSubject[] = "Subject";
+}  // namespace client_cert
+
+namespace certificate {
+const char kAuthority[] = "Authority";
+const char kClient[] = "Client";
+const char kGUID[] = "GUID";
+const char kPKCS12[] = "PKCS12";
+const char kServer[] = "Server";
 const char kTrustBits[] = "TrustBits";
 const char kType[] = "Type";
 const char kWeb[] = "Web";
@@ -206,9 +212,6 @@ const char kStretch[] = "Stretch";
 namespace eap {
 const char kAnonymousIdentity[] = "AnonymousIdentity";
 const char kAutomatic[] = "Automatic";
-const char kClientCertPattern[] = "ClientCertPattern";
-const char kClientCertRef[] = "ClientCertRef";
-const char kClientCertType[] = "ClientCertType";
 const char kEAP_AKA[] = "EAP-AKA";
 const char kEAP_FAST[] = "EAP-FAST";
 const char kEAP_SIM[] = "EAP-SIM";
@@ -232,9 +235,6 @@ const char kUseSystemCAs[] = "UseSystemCAs";
 
 namespace vpn {
 const char kAutoConnect[] = "AutoConnect";
-const char kClientCertPattern[] = "ClientCertPattern";
-const char kClientCertRef[] = "ClientCertRef";
-const char kClientCertType[] = "ClientCertType";
 const char kHost[] = "Host";
 const char kIPsec[] = "IPsec";
 const char kL2TP[] = "L2TP";
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[];