Resolve certificate references in ONC by PEM.

chromeos/network/onc/onc_certificate_importer.h

Index: chromeos/network/onc/onc_certificate_importer.h
diff --git a/chromeos/network/onc/onc_certificate_importer.h b/chromeos/network/onc/onc_certificate_importer.h
index 5971831cb88e9752edca8ff5995c845a1c08dce9..09f4c5e7e15d455a783285b1e7159bc32714e228 100644
--- a/chromeos/network/onc/onc_certificate_importer.h
+++ b/chromeos/network/onc/onc_certificate_importer.h
@@ -5,6 +5,7 @@
 #ifndef CHROMEOS_NETWORK_ONC_ONC_CERTIFICATE_IMPORTER_H_
 #define CHROMEOS_NETWORK_ONC_ONC_CERTIFICATE_IMPORTER_H_
 
+#include <map>
 #include <string>
 #include <vector>
 
@@ -32,6 +33,8 @@ namespace onc {
 // is stored together with the certificate as Nickname.

[Mattias Nissler (ping if slow), 2013/06/14 12:56:44]

you'll want to update this comment

[pneubeck (no reviews), 2013/06/21 12:53:56]

Done.

 class CHROMEOS_EXPORT CertificateImporter {
  public:
+  typedef std::map<std::string, scoped_refptr<net::X509Certificate> >
+      CertsByGUID;
   enum ParseResult {
     IMPORT_OK,
     IMPORT_INCOMPLETE,
@@ -54,7 +57,8 @@ class CHROMEOS_EXPORT CertificateImporter {
   // If no error occurred, returns IMPORT_OK.
   ParseResult ParseAndStoreCertificates(
       const base::ListValue& onc_certificates,
-      net::CertificateList* onc_trusted_certificates);
+      net::CertificateList* onc_trusted_certificates,
+      CertsByGUID* imported_server_and_ca_certs);
 
   // Lists the certificates that have the string |label| as their certificate
   // nickname (exact match).
@@ -71,13 +75,15 @@ class CHROMEOS_EXPORT CertificateImporter {
   // store. Returns true if the operation succeeded.
   bool ParseAndStoreCertificate(
       const base::DictionaryValue& certificate,
-      net::CertificateList* onc_trusted_certificates);
+      net::CertificateList* onc_trusted_certificates,
+      CertsByGUID* imported_server_and_ca_certs);
 
   bool ParseServerOrCaCertificate(
       const std::string& cert_type,
       const std::string& guid,
       const base::DictionaryValue& certificate,
-      net::CertificateList* onc_trusted_certificates);
+      net::CertificateList* onc_trusted_certificates,
+      CertsByGUID* imported_server_and_ca_certs);
 
   bool ParseClientCertificate(const std::string& guid,
                               const base::DictionaryValue& certificate);