Migrate Slot ID of client certs in network configuration.

chromeos/network/client_cert_util.h

Index: chromeos/network/client_cert_util.h
diff --git a/chromeos/network/client_cert_util.h b/chromeos/network/client_cert_util.h
index 68f07a711732f9f4390d02e3bb66b1989be24f00..89a7af0ab3b3b2a12bcd18a130d701b6e7c510aa 100644
--- a/chromeos/network/client_cert_util.h
+++ b/chromeos/network/client_cert_util.h
@@ -57,8 +57,14 @@ bool CertPrincipalMatches(const IssuerSubjectPattern& pattern,
 
 // Returns the PKCS11 id part of |cert_id|, which is expected to be the value of
 // the Shill property kEapCertIdProperty or kEapKeyIdProperty.
-CHROMEOS_EXPORT std::string GetPkcs11IdFromEapCertId(
-    const std::string& cert_id);
+CHROMEOS_EXPORT std::string GetPkcs11AndSlotIdFromEapCertId(
+    const std::string& cert_id,
+    int* slot_id);
+
+CHROMEOS_EXPORT void GetShillProperties(const base::DictionaryValue& properties,
+                                        ConfigType* cert_config_type,
+                                        int* tpm_slot,
+                                        std::string* pkcs11_id);

[stevenjb, 2014/08/14 23:58:39]

At minimum this needs a comment. It also seems oddly named since |properties| is
an input. Maybe GetCertConfigFromShillProperties?

[pneubeck (no reviews), 2014/08/15 13:15:21]

Done.

 
 // Sets the properties of a client cert and the TPM slot that it's contained in.
 // |cert_config_type| determines which dictionary entries to set.