Allow custom deleters to opt out of self reset checks for scoped_ptr.

net/ssl/openssl_client_key_store.h

 // 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.
 
 #ifndef NET_SSL_OPENSSL_CLIENT_KEY_STORE_H_
 #define NET_SSL_OPENSSL_CLIENT_KEY_STORE_H_
 
 #include <openssl/evp.h>
 
 #include <vector>
@@ skipping 55 matching lines @@
   // must still call EVP_PKEY_free on them.
   void AddKeyPair(EVP_PKEY* pub_key, EVP_PKEY* private_key);
 
  private:
   // KeyPair is an internal class used to hold a pair of private / public
   // EVP_PKEY objects, with appropriate ownership.
   class KeyPair {
    public:
     explicit KeyPair(EVP_PKEY* pub_key, EVP_PKEY* priv_key);
     KeyPair(const KeyPair& other);
-    void operator=(const KeyPair& other);
+    void operator=(KeyPair other);
+    void swap(KeyPair& other);
     ~KeyPair();
 
     crypto::ScopedEVP_PKEY public_key;
     crypto::ScopedEVP_PKEY private_key;
 
    private:
     KeyPair();  // intentionally not implemented.
   };
 
   // Returns the index of the keypair for |public_key|. or -1 if not found.
   int FindKeyPairIndex(EVP_PKEY* public_key);
 
   std::vector<KeyPair> pairs_;
 
   friend struct DefaultSingletonTraits<OpenSSLClientKeyStore>;
 
   DISALLOW_COPY_AND_ASSIGN(OpenSSLClientKeyStore);
 };
 
 }  // namespace net
 
 #endif  // NET_SSL_OPENSSL_CLIENT_KEY_STORE_H_