Convert scoped_ptr_malloc -> scoped_ptr, part 2.

google_apis/cup/client_update_protocol_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 "google_apis/cup/client_update_protocol.h"
 
 #include <keyhi.h>
 #include <pk11pub.h>
 #include <seccomon.h>
 
 #include "base/logging.h"
 #include "crypto/nss_util.h"
 #include "crypto/scoped_nss_types.h"
 
-typedef scoped_ptr_malloc<
-    CERTSubjectPublicKeyInfo,
-    crypto::NSSDestroyer<CERTSubjectPublicKeyInfo,
-                         SECKEY_DestroySubjectPublicKeyInfo> >
+typedef scoped_ptr<CERTSubjectPublicKeyInfo,
+                   crypto::NSSDestroyer<CERTSubjectPublicKeyInfo,
+                                        SECKEY_DestroySubjectPublicKeyInfo> >
     ScopedCERTSubjectPublicKeyInfo;
 
 ClientUpdateProtocol::~ClientUpdateProtocol() {
   if (public_key_)
     SECKEY_DestroyPublicKey(public_key_);
 }
 
 bool ClientUpdateProtocol::LoadPublicKey(const base::StringPiece& public_key) {
   crypto::EnsureNSSInit();
 
@@ skipping 43 matching lines @@
 
   encrypted_key_source_.resize(keysize);
   return SECSuccess == PK11_PubEncryptRaw(
       public_key_,
       &encrypted_key_source_[0],
       const_cast<unsigned char*>(&key_source[0]),
       key_source.size(),
       NULL);
 }