Resolve certificate references in ONC by PEM.

chromeos/network/onc/onc_constants.h

Index: chromeos/network/onc/onc_constants.h
diff --git a/chromeos/network/onc/onc_constants.h b/chromeos/network/onc/onc_constants.h
index 76325b1c59b14fdfec1847b35225f61a42c1f8ea..0b74e641e63999ebd3b5eff5398a83928c17e635 100644
--- a/chromeos/network/onc/onc_constants.h
+++ b/chromeos/network/onc/onc_constants.h
@@ -212,6 +212,7 @@ CHROMEOS_EXPORT extern const char kPEAP[];
 CHROMEOS_EXPORT extern const char kPassword[];
 CHROMEOS_EXPORT extern const char kSaveCredentials[];
 CHROMEOS_EXPORT extern const char kServerCARef[];
+CHROMEOS_EXPORT extern const char kServerCAPEM[];
 CHROMEOS_EXPORT extern const char kUseSystemCAs[];
 }  // namespace eap
 
@@ -219,25 +220,19 @@ namespace vpn {
 CHROMEOS_EXPORT extern const char kAuthNoCache[];
 CHROMEOS_EXPORT extern const char kAuthRetry[];
 CHROMEOS_EXPORT extern const char kAuth[];
-CHROMEOS_EXPORT extern const char kAuthenticationType[];
 CHROMEOS_EXPORT extern const char kAutoConnect[];
-CHROMEOS_EXPORT extern const char kCert[];
 CHROMEOS_EXPORT extern const char kCipher[];
 CHROMEOS_EXPORT extern const char kClientCertPattern[];
 CHROMEOS_EXPORT extern const char kClientCertRef[];
 CHROMEOS_EXPORT extern const char kClientCertType[];
 CHROMEOS_EXPORT extern const char kCompLZO[];
 CHROMEOS_EXPORT extern const char kCompNoAdapt[];
-CHROMEOS_EXPORT extern const char kEAP[];
-CHROMEOS_EXPORT extern const char kGroup[];
 CHROMEOS_EXPORT extern const char kHost[];
-CHROMEOS_EXPORT extern const char kIKEVersion[];
 CHROMEOS_EXPORT extern const char kIPsec[];
 CHROMEOS_EXPORT extern const char kKeyDirection[];
 CHROMEOS_EXPORT extern const char kL2TP[];
 CHROMEOS_EXPORT extern const char kNsCertType[];
 CHROMEOS_EXPORT extern const char kOpenVPN[];
-CHROMEOS_EXPORT extern const char kPSK[];
 CHROMEOS_EXPORT extern const char kPassword[];
 CHROMEOS_EXPORT extern const char kPort[];
 CHROMEOS_EXPORT extern const char kProto[];
@@ -247,7 +242,7 @@ CHROMEOS_EXPORT extern const char kRemoteCertKU[];
 CHROMEOS_EXPORT extern const char kRemoteCertTLS[];
 CHROMEOS_EXPORT extern const char kRenegSec[];
 CHROMEOS_EXPORT extern const char kSaveCredentials[];
-CHROMEOS_EXPORT extern const char kServerCARef[];
+CHROMEOS_EXPORT extern const char kServerCertPEM[];
 CHROMEOS_EXPORT extern const char kServerCertRef[];
 CHROMEOS_EXPORT extern const char kServerPollTimeout[];
 CHROMEOS_EXPORT extern const char kShaper[];
@@ -258,13 +253,26 @@ CHROMEOS_EXPORT extern const char kTypeL2TP_IPsec[];
 CHROMEOS_EXPORT extern const char kType[];
 CHROMEOS_EXPORT extern const char kUsername[];
 CHROMEOS_EXPORT extern const char kVerb[];
-CHROMEOS_EXPORT extern const char kXAUTH[];
 }  // namespace vpn
 
+namespace ipsec {
+CHROMEOS_EXPORT extern const char kAuthenticationType[];
+CHROMEOS_EXPORT extern const char kCert[];
+CHROMEOS_EXPORT extern const char kEAP[];
+CHROMEOS_EXPORT extern const char kGroup[];
+CHROMEOS_EXPORT extern const char kIKEVersion[];
+CHROMEOS_EXPORT extern const char kPSK[];
+CHROMEOS_EXPORT extern const char kServerCAPEM[];
+CHROMEOS_EXPORT extern const char kServerCARef[];
+CHROMEOS_EXPORT extern const char kXAUTH[];
+}  // namespace ipsec
+
 namespace openvpn {
-CHROMEOS_EXPORT extern const char kNone[];
 CHROMEOS_EXPORT extern const char kInteract[];
 CHROMEOS_EXPORT extern const char kNoInteract[];
+CHROMEOS_EXPORT extern const char kNone[];
+CHROMEOS_EXPORT extern const char kServerCAPEMs[];
+CHROMEOS_EXPORT extern const char kServerCARef[];
 CHROMEOS_EXPORT extern const char kServer[];
 }  // namespace openvpn