From b9ce9a0eb712975c7a6ab339639c607d13b4fb1a Mon Sep 17 00:00:00 2001 From: "J.C. Jones" Date: Tue, 13 Aug 2019 10:54:58 -0700 Subject: [PATCH] Bug 1572791 - Fixup clang-format r=bustage --- gtests/ssl_gtest/ssl_resumption_unittest.cc | 2 +- gtests/ssl_gtest/tls_agent.cc | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gtests/ssl_gtest/ssl_resumption_unittest.cc b/gtests/ssl_gtest/ssl_resumption_unittest.cc index 24d29153e0..e48b9fa093 100644 --- a/gtests/ssl_gtest/ssl_resumption_unittest.cc +++ b/gtests/ssl_gtest/ssl_resumption_unittest.cc @@ -1301,7 +1301,7 @@ TEST_P(TlsConnectTls13ResumptionToken, ConnectResumeGetInfoZeroRtt) { client_->GetTokenInfo(token); ScopedCERTCertificate cert( PK11_FindCertFromNickname(server_->name().c_str(), nullptr)); - ASSERT_NE(nullptr, cert.get()); + ASSERT_NE(nullptr, cert.get()); CheckGetInfoResult(now(), 1, 1024, cert, token); ZeroRttSendReceive(true, true); diff --git a/gtests/ssl_gtest/tls_agent.cc b/gtests/ssl_gtest/tls_agent.cc index 341a8a308c..89c4e3a1f9 100644 --- a/gtests/ssl_gtest/tls_agent.cc +++ b/gtests/ssl_gtest/tls_agent.cc @@ -129,13 +129,13 @@ void TlsAgent::SetState(State s) { ScopedSECKEYPrivateKey* priv) { cert->reset(PK11_FindCertFromNickname(name.c_str(), nullptr)); EXPECT_NE(nullptr, cert); - if(!cert) return false; + if (!cert) return false; EXPECT_NE(nullptr, cert->get()); if (!cert->get()) return false; priv->reset(PK11_FindKeyByAnyCert(cert->get(), nullptr)); EXPECT_NE(nullptr, priv); - if(!priv) return false; + if (!priv) return false; EXPECT_NE(nullptr, priv->get()); if (!priv->get()) return false; @@ -167,7 +167,8 @@ void TlsAgent::DelegateCredential(const std::string& name, ScopedCERTCertificate cert; ScopedSECKEYPrivateKey cert_priv; EXPECT_TRUE(TlsAgent::LoadCertificate(name, &cert, &cert_priv)) - << "Could not load delegate certificate: " << name << "; test db corrupt?"; + << "Could not load delegate certificate: " << name + << "; test db corrupt?"; EXPECT_EQ(SECSuccess, SSL_DelegateCredential(cert.get(), cert_priv.get(), dc_pub.get(),