Index: chrome/browser/chromeos/cros/network_constants.h |
diff --git a/chrome/browser/chromeos/cros/network_constants.h b/chrome/browser/chromeos/cros/network_constants.h |
index 187d7d9144c100cd25e9228f51d3f95a497829c7..35f6ce6beae5849ee2634e9526776a5da5144c6f 100644 |
--- a/chrome/browser/chromeos/cros/network_constants.h |
+++ b/chrome/browser/chromeos/cros/network_constants.h |
@@ -32,9 +32,8 @@ enum PropertyIndex { |
PROPERTY_INDEX_DEVICES, |
PROPERTY_INDEX_EAP, |
PROPERTY_INDEX_EAP_ANONYMOUS_IDENTITY, |
- PROPERTY_INDEX_EAP_CA_CERT, |
PROPERTY_INDEX_EAP_CA_CERT_ID, |
- PROPERTY_INDEX_EAP_CA_CERT_NSS, |
+ PROPERTY_INDEX_EAP_CA_CERT_PEM, |
PROPERTY_INDEX_EAP_CERT_ID, |
PROPERTY_INDEX_EAP_CLIENT_CERT, |
PROPERTY_INDEX_EAP_CLIENT_CERT_NSS, |
@@ -70,7 +69,7 @@ enum PropertyIndex { |
PROPERTY_INDEX_ISSUER_SUBJECT_PATTERN_ORGANIZATION, |
PROPERTY_INDEX_ISSUER_SUBJECT_PATTERN_ORGANIZATIONAL_UNIT, |
PROPERTY_INDEX_IS_ACTIVE, |
- PROPERTY_INDEX_L2TPIPSEC_CA_CERT_NSS, |
+ PROPERTY_INDEX_L2TPIPSEC_CA_CERT_PEM, |
PROPERTY_INDEX_L2TPIPSEC_CLIENT_CERT_ID, |
PROPERTY_INDEX_L2TPIPSEC_CLIENT_CERT_SLOT, |
PROPERTY_INDEX_L2TPIPSEC_GROUP_NAME, |
@@ -95,7 +94,7 @@ enum PropertyIndex { |
PROPERTY_INDEX_OPEN_VPN_AUTHNOCACHE, |
PROPERTY_INDEX_OPEN_VPN_AUTHRETRY, |
PROPERTY_INDEX_OPEN_VPN_AUTHUSERPASS, |
- PROPERTY_INDEX_OPEN_VPN_CACERT, |
+ PROPERTY_INDEX_OPEN_VPN_CA_CERT_PEM, |
PROPERTY_INDEX_OPEN_VPN_CERT, |
PROPERTY_INDEX_OPEN_VPN_CIPHER, |
PROPERTY_INDEX_OPEN_VPN_CLIENT_CERT_ID, |