Use correct slot id for client certs in network config.

chrome/browser/chromeos/options/vpn_config_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/options/vpn_config_view.h"
 
 #include "ash/system/chromeos/network/network_connect.h"
 #include "base/bind.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 435 matching lines @@
       server_ca_cert_combobox_->selected_index() : 0;
   if (index == 0) {
     // First item is "Default".
     return std::string();
   } else {
     int cert_index = index - 1;
     return CertLibrary::Get()->GetServerCACertPEMAt(cert_index);
   }
 }
 
-const std::string VPNConfigView::GetUserCertID() const {
+void VPNConfigView::SetUserCertProperties(
+    chromeos::client_cert::ConfigType client_cert_type,
+    base::DictionaryValue* properties) const {
   if (!HaveUserCerts()) {
-    return std::string();  // "None installed"
+    // No certificate selected or not required.
+    chromeos::client_cert::SetEmptyShillProperties(
+        chromeos::client_cert::CONFIG_TYPE_EAP, properties);
   } else {
     // Certificates are listed in the order they appear in the model.
     int index = user_cert_combobox_ ? user_cert_combobox_->selected_index() : 0;
-    return CertLibrary::Get()->GetUserCertPkcs11IdAt(index);
+    int slot_id = -1;
+    const std::string pkcs11_id =
+        CertLibrary::Get()->GetUserCertPkcs11IdAt(index, &slot_id);
+    chromeos::client_cert::SetShillProperties(
+        client_cert_type, slot_id, pkcs11_id, properties);
   }
 }
 
 bool VPNConfigView::GetSaveCredentials() const {
   return save_credentials_checkbox_->checked();
 }
 
 int VPNConfigView::GetProviderTypeIndex() const {
   if (provider_type_combobox_)
     return provider_type_combobox_->selected_index();
@@ skipping 357 matching lines @@
       break;
     }
     case PROVIDER_TYPE_INDEX_L2TP_IPSEC_USER_CERT: {
       std::string ca_cert_pem = GetServerCACertPEM();
       if (!ca_cert_pem.empty()) {
         base::ListValue* pem_list = new base::ListValue;
         pem_list->AppendString(ca_cert_pem);
         properties->SetWithoutPathExpansion(
             shill::kL2tpIpsecCaCertPemProperty, pem_list);
       }
-      properties->SetStringWithoutPathExpansion(
-          shill::kL2tpIpsecClientCertIdProperty, GetUserCertID());
+      SetUserCertProperties(client_cert::CONFIG_TYPE_IPSEC, properties);
       if (!group_name.empty()) {
         properties->SetStringWithoutPathExpansion(
             shill::kL2tpIpsecTunnelGroupProperty, GetGroupName());
       }
       if (!user_name.empty()) {
         properties->SetStringWithoutPathExpansion(
             shill::kL2tpIpsecUserProperty, user_name);
       }
       if (!user_passphrase.empty()) {
         properties->SetStringWithoutPathExpansion(
             shill::kL2tpIpsecPasswordProperty, user_passphrase);
       }
       break;
     }
     case PROVIDER_TYPE_INDEX_OPEN_VPN: {
       std::string ca_cert_pem = GetServerCACertPEM();
       if (!ca_cert_pem.empty()) {
         base::ListValue* pem_list = new base::ListValue;
         pem_list->AppendString(ca_cert_pem);
         properties->SetWithoutPathExpansion(
             shill::kOpenVPNCaCertPemProperty, pem_list);
       }
-      properties->SetStringWithoutPathExpansion(
-          shill::kOpenVPNClientCertIdProperty, GetUserCertID());
+      SetUserCertProperties(client_cert::CONFIG_TYPE_OPENVPN, properties);
       properties->SetStringWithoutPathExpansion(
           shill::kOpenVPNUserProperty, GetUsername());
       if (!user_passphrase.empty()) {
         properties->SetStringWithoutPathExpansion(
             shill::kOpenVPNPasswordProperty, user_passphrase);
       }
       std::string otp = GetOTP();
       if (!otp.empty()) {
         properties->SetStringWithoutPathExpansion(
             shill::kOpenVPNOTPProperty, otp);
@@ skipping 184 matching lines @@
   property_ui_data->ParseOncProperty(
       onc_source,
       onc,
       base::StringPrintf("%s.%s.%s",
                          ::onc::network_config::kVPN,
                          dict_key.c_str(),
                          key.c_str()));
 }
 
 }  // namespace chromeos