Remove certificates from Channel ID

net/quic/test_tools/crypto_test_utils_nss.cc

 // Copyright 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/quic/test_tools/crypto_test_utils.h"
 
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "crypto/ec_private_key.h"
 #include "crypto/ec_signature_creator.h"
@@ skipping 17 matching lines @@
       const string& hostname,
       scoped_ptr<ChannelIDKey>* channel_id_key,
       ChannelIDSourceCallback* /*callback*/) override {
     channel_id_key->reset(new ChannelIDKeyChromium(HostnameToKey(hostname)));
     return QUIC_SUCCESS;
   }
 
  private:
   typedef std::map<string, crypto::ECPrivateKey*> HostnameToKeyMap;
 
-  crypto::ECPrivateKey* HostnameToKey(const string& hostname) {
+  scoped_ptr<crypto::ECPrivateKey> HostnameToKey(const string& hostname) {
     HostnameToKeyMap::const_iterator it = hostname_to_key_.find(hostname);
     if (it != hostname_to_key_.end()) {
-      return it->second->Copy();
+      return scoped_ptr<crypto::ECPrivateKey>(it->second->Copy());

[mattm, 2015/04/27 20:55:53]

make_scoped_ptr

[nharper, 2015/04/29 22:07:15]

Done.

     }
 
     crypto::ECPrivateKey* keypair = crypto::ECPrivateKey::Create();
     if (!keypair) {
       return nullptr;
     }
     hostname_to_key_[hostname] = keypair;
-    return keypair->Copy();
+    return scoped_ptr<crypto::ECPrivateKey>(keypair->Copy());
   }
 
   HostnameToKeyMap hostname_to_key_;
 };
 
 // static
 ChannelIDSource* CryptoTestUtils::ChannelIDSourceForTesting() {
   return new TestChannelIDSource();
 }
 
 }  // namespace test
 
 }  // namespace net