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 ede390459a41c826063bd3a4d526aaa136d470a8..038776323e5b41ab365bde51abf3e2e1a140dacb 100644
--- a/chrome/browser/chromeos/cros/network_library_impl_base.cc
+++ b/chrome/browser/chromeos/cros/network_library_impl_base.cc
@@ -304,10 +304,11 @@ const VirtualNetworkVector&
   return remembered_virtual_networks_;
 }
 
+namespace {
+
 // Use shill's ordering of the services to determine which type of
 // network to return (i.e. don't assume priority of network types).
 // Note: This does not include any virtual networks.
-namespace {
 const Network* highest_priority(const Network* a, const Network*b) {
   if (!a)
     return b;
@@ -317,7 +318,8 @@ const Network* highest_priority(const Network* a, const Network*b) {
     return b;
   return a;
 }
-}
+
+}  // namespace
 
 const Network* NetworkLibraryImplBase::active_network() const {
   const Network* result = active_nonvirtual_network();
@@ -806,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;
@@ -828,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;
@@ -867,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);
@@ -913,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(
@@ -1023,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 ||
@@ -1103,7 +1106,8 @@ void NetworkLibraryImplBase::LoadOncNetworks(
     // Configure the network.
     scoped_ptr<base::DictionaryValue> shill_dict =
         onc::TranslateONCObjectToShill(&onc::kNetworkConfigurationSignature,
-                                       *normalized_network);
+                                       *normalized_network,
+                                       fingerprint_to_pem);

[stevenjb, 2013/06/21 22:47:13]

Passing the callback through here is pretty confusing to me. I really wish this
wasn't part of NetworkLibrary. Hopefully we will have have the equivalent of
CallConfigureService() and ForgetNetworksById() available in NetworkHandler soon
and we can move this. In the meanwhile, please add a comment.

 
     // Set the ProxyConfig.
     const base::DictionaryValue* proxy_settings;