| Index: remoting/host/token_validator_base_unittest.cc
|
| diff --git a/remoting/host/token_validator_base_unittest.cc b/remoting/host/token_validator_base_unittest.cc
|
| index 4404771e2c851838acbe5dca265e3b913d2bd884..ddff75575d3d7bcfa7c1975775450b1c71a346fe 100644
|
| --- a/remoting/host/token_validator_base_unittest.cc
|
| +++ b/remoting/host/token_validator_base_unittest.cc
|
| @@ -39,7 +39,7 @@
|
| explicit TestTokenValidator(const ThirdPartyAuthConfig& config);
|
| ~TestTokenValidator() override;
|
|
|
| - void SelectCertificates(net::CertificateList selected_certs);
|
| + void SelectCertificates(net::CertificateList* selected_certs);
|
|
|
| void ExpectContinueWithCertificate(net::X509Certificate* client_cert);
|
|
|
| @@ -60,8 +60,8 @@
|
| TestTokenValidator::~TestTokenValidator() {}
|
|
|
| void TestTokenValidator::SelectCertificates(
|
| - net::CertificateList selected_certs) {
|
| - OnCertificatesSelected(nullptr, std::move(selected_certs));
|
| + net::CertificateList* selected_certs) {
|
| + OnCertificatesSelected(selected_certs, nullptr);
|
| }
|
|
|
| void TestTokenValidator::ExpectContinueWithCertificate(
|
| @@ -116,43 +116,43 @@
|
| // No certificate.
|
| net::CertificateList certificates {};
|
| token_validator_->ExpectContinueWithCertificate(nullptr);
|
| - token_validator_->SelectCertificates(std::move(certificates));
|
| + token_validator_->SelectCertificates(&certificates);
|
|
|
| // One invalid certificate.
|
| certificates = { cert_expired_5_minutes_ago };
|
| token_validator_->ExpectContinueWithCertificate(nullptr);
|
| - token_validator_->SelectCertificates(std::move(certificates));
|
| + token_validator_->SelectCertificates(&certificates);
|
|
|
| // One valid certificate.
|
| certificates = { cert_start_5min_expire_5min };
|
| token_validator_->ExpectContinueWithCertificate(
|
| cert_start_5min_expire_5min.get());
|
| - token_validator_->SelectCertificates(std::move(certificates));
|
| + token_validator_->SelectCertificates(&certificates);
|
|
|
| // One valid one invalid.
|
| certificates = { cert_expired_5_minutes_ago, cert_start_5min_expire_5min };
|
| token_validator_->ExpectContinueWithCertificate(
|
| cert_start_5min_expire_5min.get());
|
| - token_validator_->SelectCertificates(std::move(certificates));
|
| + token_validator_->SelectCertificates(&certificates);
|
|
|
| // Two valid certs. Choose latest created.
|
| certificates = { cert_start_10min_expire_5min, cert_start_5min_expire_5min };
|
| token_validator_->ExpectContinueWithCertificate(
|
| cert_start_5min_expire_5min.get());
|
| - token_validator_->SelectCertificates(std::move(certificates));
|
| + token_validator_->SelectCertificates(&certificates);
|
|
|
| // Two valid certs. Choose latest expires.
|
| certificates = { cert_start_5min_expire_5min, cert_start_5min_expire_10min };
|
| token_validator_->ExpectContinueWithCertificate(
|
| cert_start_5min_expire_10min.get());
|
| - token_validator_->SelectCertificates(std::move(certificates));
|
| + token_validator_->SelectCertificates(&certificates);
|
|
|
| // 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));
|
| + token_validator_->SelectCertificates(&certificates);
|
| }
|
|
|
| } // namespace remoting
|
|
|