Refactor client cert private key handling.

net/ssl/ssl_platform_key_nss_unittest.cc

 // Copyright 2016 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 "net/ssl/ssl_platform_key.h"
+#include "net/ssl/ssl_platform_key_nss.h"
 
 #include <keyhi.h>
 #include <pk11pub.h>
 #include <stdint.h>
 #include <string.h>
 
 #include <memory>
 #include <string>
 #include <vector>
 
@@ skipping 98 matching lines @@
     ASSERT_TRUE(cert);
     ASSERT_TRUE(ImportClientCertToSlot(cert, test_db.slot()));
   } else {
     cert = ImportClientCertAndKeyFromFile(GetTestCertsDirectory(),
                                           test_key.cert_file, test_key.key_file,
                                           test_db.slot());
     ASSERT_TRUE(cert);
   }
 
   // Look up the key.
-  scoped_refptr<SSLPrivateKey> key = FetchClientCertPrivateKey(cert.get());
+  scoped_refptr<SSLPrivateKey> key =
+      FetchClientCertPrivateKey(cert.get(), nullptr);
   ASSERT_TRUE(key);
 
   // All NSS keys are expected to have the same hash preferences.
   std::vector<SSLPrivateKey::Hash> expected_hashes = {
       SSLPrivateKey::Hash::SHA512, SSLPrivateKey::Hash::SHA384,
       SSLPrivateKey::Hash::SHA256, SSLPrivateKey::Hash::SHA1,
   };
   EXPECT_EQ(expected_hashes, key->GetDigestPreferences());
 
   TestSSLPrivateKeyMatches(key.get(), pkcs8);
 }
 
 INSTANTIATE_TEST_CASE_P(,
                         SSLPlatformKeyNSSTest,
                         testing::ValuesIn(kTestKeys),
                         TestKeyToString);
 
 }  // namespace net