Enable system NSS key slot.

net/ssl/client_cert_store_chromeos.h

Index: net/ssl/client_cert_store_chromeos.h
diff --git a/net/ssl/client_cert_store_chromeos.h b/net/ssl/client_cert_store_chromeos.h
index 087190ce11a6e1650630c25f1e23ae455fb2b0d0..0e015b313d70a8579359a6f57947d08d2c9ed4db 100644
--- a/net/ssl/client_cert_store_chromeos.h
+++ b/net/ssl/client_cert_store_chromeos.h
@@ -15,7 +15,10 @@ namespace net {
 
 class NET_EXPORT ClientCertStoreChromeOS : public ClientCertStoreNSS {
  public:
+  // Always accesses client certs of the user's private and public slot. If
+  // |use_system_slot| is true, also accesses the system slot.

[Ryan Sleevi, 2014/07/29 00:23:16]

This comment seems confusing.

// Constructs a ClientCertStore that will return client certs
// available on the user's private and public slots. If
// |use_system_slot| is true, certs on the system slot will also
// be returned.

[pneubeck (no reviews), 2014/07/29 16:00:15]

Done.

   ClientCertStoreChromeOS(
+      bool use_system_slot,
       const std::string& username_hash,
       const PasswordDelegateFactory& password_delegate_factory);
   virtual ~ClientCertStoreChromeOS();
@@ -33,13 +36,13 @@ class NET_EXPORT ClientCertStoreChromeOS : public ClientCertStoreNSS {
                                   CertificateList* selected_certs) OVERRIDE;
 
  private:
-  friend class ClientCertStoreChromeOSTestDelegate;
-
-  void DidGetPrivateSlot(const SSLCertRequestInfo* request,
-                         CertificateList* selected_certs,
-                         const base::Closure& callback,
-                         crypto::ScopedPK11Slot private_slot);
+  void DidGetPrivateAndSystemSlot(const SSLCertRequestInfo* request,
+                                  CertificateList* selected_certs,
+                                  const base::Closure& callback,
+                                  crypto::ScopedPK11Slot system_slot,
+                                  crypto::ScopedPK11Slot private_slot);
 
+  bool use_system_slot_;
   std::string username_hash_;
   NSSProfileFilterChromeOS profile_filter_;