Resolve certificate references in ONC by PEM.

chrome/browser/ui/webui/net_internals/net_internals_ui.cc

Index: chrome/browser/ui/webui/net_internals/net_internals_ui.cc
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
index 54f9d6681c5d4d62f66c58cb72e1674181c1c1fc..6a6f31b12fea3942f4da86f8fcd87d34599c2a9f 100644
--- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
@@ -1568,23 +1568,32 @@ void NetInternalsMessageHandler::OnImportONCFile(const ListValue* list) {
   std::string error;
   if (!chromeos::onc::ParseAndValidateOncForImport(
           onc_blob, onc_source, passcode, &network_configs, &certificates)) {
-    error = "Errors occurred during the ONC parsing.";
+    error = "Errors occurred during the ONC parsing. ";
+    LOG(ERROR) << error;
+  }
+
+  chromeos::CertificateHandler::CertsByGUID imported_server_and_ca_certs;
+  chromeos::CertificateHandler certificate_handler;
+  if (!certificate_handler.ImportCertificates(certificates, onc_source, NULL,
+                                              &imported_server_and_ca_certs)) {
+    error += "Some certificates couldn't be imported. ";
+    LOG(ERROR) << error;
+  }
+
+  if (!chromeos::onc::ResolveServerCertRefsInNetworks(
+          imported_server_and_ca_certs, &network_configs)) {
+    error += "Some certificate references could not be resolved. ";
     LOG(ERROR) << error;
   }
 
   chromeos::NetworkLibrary* network_library =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   network_library->LoadOncNetworks(network_configs, onc_source);
+
   // Now that we've added the networks, we need to rescan them so they'll be
   // available from the menu more immediately.
   network_library->RequestNetworkScan();
 
-  chromeos::CertificateHandler certificate_handler;
-  if (!certificate_handler.ImportCertificates(certificates, onc_source, NULL)) {
-    error += "Some certificates couldn't be imported.";
-    LOG(ERROR) << error;
-  }
-
   SendJavascriptCommand("receivedONCFileParse",
                         Value::CreateStringValue(error));
 }