ONC: Cleanup client certificate related fields.

components/onc/onc_constants.cc

 // Copyright 2013 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 "components/onc/onc_constants.h"
 
 // Constants for ONC properties.
 namespace onc {
 
 const char kAugmentationActiveSetting[] = "Active";
@@ skipping 111 matching lines @@
 }  // namespace cellular_apn
 
 namespace connection_state {
 const char kConnected[] = "Connected";
 const char kConnecting[] = "Connecting";
 const char kNotConnected[] = "NotConnected";
 }  // namespace connection_state
 
 namespace ethernet {
 const char kAuthentication[] = "Authentication";
+const char kAuthenticationNone[] = "None";
 const char kEAP[] = "EAP";
-const char kNone[] = "None";
 const char k8021X[] = "8021X";
 }  // namespace ethernet
 
 namespace ipconfig {
 const char kGateway[] = "Gateway";
 const char kIPAddress[] = "IPAddress";
 const char kIPv4[] = "IPv4";
 const char kIPv6[] = "IPv6";
 const char kNameServers[] = "NameServers";
 const char kRoutingPrefix[] = "RoutingPrefix";
 const char kType[] = "Type";
 }  // namespace ipconfig
 
 namespace wifi {
 const char kAutoConnect[] = "AutoConnect";
 const char kBSSID[] = "BSSID";
 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";
 const char kWPA_EAP[] = "WPA-EAP";
 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 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 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 kSubject[] = "Subject";
 const char kTrustBits[] = "TrustBits";
 const char kType[] = "Type";
 const char kWeb[] = "Web";
 const char kX509[] = "X509";
 }  // namespace certificate
 
 namespace encrypted {
 const char kAES256[] = "AES256";
 const char kCipher[] = "Cipher";
 const char kCiphertext[] = "Ciphertext";
 const char kHMACMethod[] = "HMACMethod";
 const char kHMAC[] = "HMAC";
 const char kIV[] = "IV";
 const char kIterations[] = "Iterations";
 const char kPBKDF2[] = "PBKDF2";
 const char kSHA1[] = "SHA1";
 const char kSalt[] = "Salt";
 const char kStretch[] = "Stretch";
 }  // namespace encrypted
 
 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";
 const char kEAP_TLS[] = "EAP-TLS";
 const char kEAP_TTLS[] = "EAP-TTLS";
 const char kIdentity[] = "Identity";
 const char kInner[] = "Inner";
 const char kLEAP[] = "LEAP";
 const char kMD5[] = "MD5";
 const char kMSCHAPv2[] = "MSCHAPv2";
 const char kOuter[] = "Outer";
 const char kPAP[] = "PAP";
 const char kPEAP[] = "PEAP";
 const char kPassword[] = "Password";
 const char kSaveCredentials[] = "SaveCredentials";
 const char kServerCAPEMs[] = "ServerCAPEMs";
 const char kServerCARef[] = "ServerCARef";
 const char kServerCARefs[] = "ServerCARefs";
 const char kUseSystemCAs[] = "UseSystemCAs";
 }  // namespace eap
 
 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";
 const char kOpenVPN[] = "OpenVPN";
 const char kPassword[] = "Password";
 const char kSaveCredentials[] = "SaveCredentials";
 const char kTypeL2TP_IPsec[] = "L2TP-IPsec";
 const char kType[] = "Type";
 const char kUsername[] = "Username";
 }  // namespace vpn
@@ skipping 77 matching lines @@
 const char kLoginIDField[] = "${LOGIN_ID}";
 const char kEmailField[] = "${LOGIN_EMAIL}";
 }  // namespace substitutes
 
 namespace global_network_config {
 const char kAllowOnlyPolicyNetworksToAutoconnect[] =
     "AllowOnlyPolicyNetworksToAutoconnect";
 }  // global_network_config
 
 }  // namespace onc