Refactor client cert private key handling.

remoting/host/token_validator_base_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 "remoting/host/token_validator_base.h"
 
 #include <vector>
 
 #include "base/atomic_sequence_num.h"
 #include "crypto/rsa_private_key.h"
 #include "net/cert/x509_util.h"
+#include "net/ssl/client_cert_identity_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 const char kTokenUrl[] = "https://example.com/token";
 const char kTokenValidationUrl[] = "https://example.com/validate";
 const char kTokenValidationCertIssuer[] = "*";
 
 base::StaticAtomicSequenceNumber g_serial_number;
 
@@ skipping 15 matching lines @@
 class TestTokenValidator : TokenValidatorBase {
  public:
   explicit TestTokenValidator(const ThirdPartyAuthConfig& config);
   ~TestTokenValidator() override;
 
   void SelectCertificates(net::CertificateList selected_certs);
 
   void ExpectContinueWithCertificate(net::X509Certificate* client_cert);
 
  protected:
-  void ContinueWithCertificate(net::X509Certificate* client_cert,
-                               net::SSLPrivateKey* client_private_key) override;
+  void ContinueWithCertificate(
+      scoped_refptr<net::X509Certificate> client_cert,
+      scoped_refptr<net::SSLPrivateKey> client_private_key) override;
 
  private:
   void StartValidateRequest(const std::string& token) override {}
 
   net::X509Certificate* expected_client_cert_ = nullptr;
 };
 
 TestTokenValidator::TestTokenValidator(const ThirdPartyAuthConfig& config) :
     TokenValidatorBase(config, "", nullptr) {
 }
 
 TestTokenValidator::~TestTokenValidator() {}
 
 void TestTokenValidator::SelectCertificates(
     net::CertificateList selected_certs) {
-  OnCertificatesSelected(nullptr, std::move(selected_certs));
+  OnCertificatesSelected(
+      nullptr,
+      net::FakeClientCertIdentityListFromCertificateList(selected_certs));
 }
 
 void TestTokenValidator::ExpectContinueWithCertificate(
     net::X509Certificate* client_cert) {
   expected_client_cert_ = client_cert;
 }
 
 void TestTokenValidator::ContinueWithCertificate(
-    net::X509Certificate* client_cert,
-    net::SSLPrivateKey* client_private_key) {
-  EXPECT_EQ(expected_client_cert_, client_cert);
+    scoped_refptr<net::X509Certificate> client_cert,
+    scoped_refptr<net::SSLPrivateKey> client_private_key) {
+  // XXX test private key
+  EXPECT_EQ(expected_client_cert_, client_cert.get());
 }
 
 class TokenValidatorBaseTest : public testing::Test {
  public:
   void SetUp() override;
  protected:
   std::unique_ptr<TestTokenValidator> token_validator_;
 };
 
 void TokenValidatorBaseTest::SetUp() {
@@ skipping 63 matching lines @@
 
   // Pick the best given all certificates.
   certificates = { cert_expired_5_minutes_ago, cert_start_5min_expire_5min,
       cert_start_5min_expire_10min, cert_start_10min_expire_5min };
     token_validator_->ExpectContinueWithCertificate(
         cert_start_5min_expire_10min.get());
     token_validator_->SelectCertificates(std::move(certificates));
 }
 
 }  // namespace remoting