Switch to OpenSSL's |EVP_PKEY_up_ref| signature.

net/ssl/openssl_client_key_store.cc

 // Copyright (c) 2013 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/openssl_client_key_store.h"
 
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 
 #include <algorithm>
@@ skipping 21 matching lines @@
 
 }  // namespace
 
 OpenSSLClientKeyStore::OpenSSLClientKeyStore() {
 }
 
 OpenSSLClientKeyStore::~OpenSSLClientKeyStore() {
 }
 
 OpenSSLClientKeyStore::KeyPair::KeyPair(EVP_PKEY* pub_key, EVP_PKEY* priv_key)
-    : public_key(EVP_PKEY_up_ref(pub_key)),
-      private_key(EVP_PKEY_up_ref(priv_key)) {
+    : public_key(pub_key), private_key(priv_key) {
+  EVP_PKEY_up_ref(pub_key);
+  EVP_PKEY_up_ref(priv_key);
 }
 
 OpenSSLClientKeyStore::KeyPair::~KeyPair() {
 }
 
 OpenSSLClientKeyStore::KeyPair::KeyPair(const KeyPair& other)
-    : public_key(EVP_PKEY_up_ref(other.public_key.get())),
-      private_key(EVP_PKEY_up_ref(other.private_key.get())) {
+    : public_key(other.public_key.get()), private_key(other.private_key.get()) {
+  EVP_PKEY_up_ref(public_key.get());
+  EVP_PKEY_up_ref(private_key.get());
 }
 
 void OpenSSLClientKeyStore::KeyPair::operator=(KeyPair other) {
   swap(other);
 }
 
 void OpenSSLClientKeyStore::KeyPair::swap(KeyPair& other) {
   using std::swap;
   swap(public_key, other.public_key);
   swap(private_key, other.private_key);
@@ skipping 40 matching lines @@
     return crypto::ScopedEVP_PKEY();
 
   crypto::ScopedEVP_PKEY pub_key(GetOpenSSLPublicKey(client_cert));
   if (!pub_key.get())
     return crypto::ScopedEVP_PKEY();
 
   int index = FindKeyPairIndex(pub_key.get());
   if (index < 0)
     return crypto::ScopedEVP_PKEY();
 
-  return crypto::ScopedEVP_PKEY(
-      EVP_PKEY_up_ref(pairs_[index].private_key.get()));
+  EVP_PKEY_up_ref(pairs_[index].private_key.get());
+  return crypto::ScopedEVP_PKEY(pairs_[index].private_key.get());
 }
 
 void OpenSSLClientKeyStore::Flush() {
   pairs_.clear();
 }
 
 OpenSSLClientKeyStore* OpenSSLClientKeyStore::GetInstance() {
   return base::Singleton<OpenSSLClientKeyStore>::get();
 }
 
 }  // namespace net