Resolve certificate references in ONC by PEM.

chrome/browser/chromeos/cros/network_library_impl_base.cc

Index: chrome/browser/chromeos/cros/network_library_impl_base.cc
diff --git a/chrome/browser/chromeos/cros/network_library_impl_base.cc b/chrome/browser/chromeos/cros/network_library_impl_base.cc
index 729d643eeb50592facabb8e1d1aae42021e38b8b..75cbe83b723b081a93aa998643a31f412df56278 100644
--- a/chrome/browser/chromeos/cros/network_library_impl_base.cc
+++ b/chrome/browser/chromeos/cros/network_library_impl_base.cc
@@ -808,8 +808,8 @@ void NetworkLibraryImplBase::ConnectToUnconfiguredWifiNetwork(
     connect_data_.service_name = ssid;
     connect_data_.eap_method = eap_config->method;
     connect_data_.eap_auth = eap_config->auth;
-    connect_data_.server_ca_cert_nss_nickname =
-        eap_config->server_ca_cert_nss_nickname;
+    connect_data_.server_ca_cert_fingerprint =
+        eap_config->server_ca_cert_fingerprint;
     connect_data_.eap_use_system_cas = eap_config->use_system_cas;
     connect_data_.client_cert_pkcs11_id =
         eap_config->client_cert_pkcs11_id;
@@ -830,8 +830,8 @@ void NetworkLibraryImplBase::ConnectToUnconfiguredVirtualNetwork(
   connect_data_.service_name = service_name;
   connect_data_.server_hostname = server_hostname;
   connect_data_.psk_key = config.psk;
-  connect_data_.server_ca_cert_nss_nickname =
-      config.server_ca_cert_nss_nickname;
+  connect_data_.server_ca_cert_fingerprint =
+      config.server_ca_cert_fingerprint;
   connect_data_.client_cert_pkcs11_id = config.client_cert_pkcs11_id;
   connect_data_.username = config.username;
   connect_data_.passphrase = config.user_passphrase;
@@ -869,7 +869,7 @@ void NetworkLibraryImplBase::ConnectToWifiNetworkUsingConnectData(
     // Enterprise 802.1X EAP network.
     wifi->SetEAPMethod(data.eap_method);
     wifi->SetEAPPhase2Auth(data.eap_auth);
-    wifi->SetEAPServerCaCertNssNickname(data.server_ca_cert_nss_nickname);
+    wifi->SetEAPServerCaCertFingerprint(data.server_ca_cert_fingerprint);
     wifi->SetEAPUseSystemCAs(data.eap_use_system_cas);
     wifi->SetEAPClientCertPkcs11Id(data.client_cert_pkcs11_id);
     wifi->SetEAPIdentity(data.eap_identity);
@@ -915,7 +915,7 @@ void NetworkLibraryImplBase::ConnectToVirtualNetworkUsingConnectData(
   if (!data.server_hostname.empty())
     vpn->set_server_hostname(data.server_hostname);
 
-  vpn->SetCACertNSS(data.server_ca_cert_nss_nickname);
+  vpn->SetCACertFingerprint(data.server_ca_cert_fingerprint);
   switch (vpn->provider_type()) {
     case PROVIDER_TYPE_L2TP_IPSEC_PSK:
       vpn->SetL2TPIPsecPSKCredentials(
@@ -1025,7 +1025,8 @@ class UserStringSubstitution : public onc::StringSubstitution {
 
 void NetworkLibraryImplBase::LoadOncNetworks(
     const base::ListValue& network_configs,
-    onc::ONCSource source) {
+    onc::ONCSource source,
+    const base::Callback<std::string(const std::string&)>& fingerprint_to_pem) {
   VLOG(2) << __func__ << ": called on " << network_configs;
   NetworkProfile* profile = NULL;
   bool from_policy = (source == onc::ONC_SOURCE_USER_POLICY ||
@@ -1099,7 +1100,8 @@ void NetworkLibraryImplBase::LoadOncNetworks(
     // Configure the network.
     scoped_ptr<base::DictionaryValue> shill_dict =
         onc::TranslateONCObjectToShill(&onc::kNetworkConfigurationSignature,
-                                       *expanded_network);
+                                       *expanded_network,
+                                       fingerprint_to_pem);
 
     // Set the ProxyConfig.
     const base::DictionaryValue* proxy_settings;