Fix remaining incompatibilities between scoped_ptr and unique_ptr.

net/test/cert_test_util_nss.cc

 // Copyright 2014 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/test/cert_test_util.h"
 
 #include <pk11pub.h>
 #include <secmodt.h>
 
 #include "base/files/file_path.h"
@@ skipping 19 matching lines @@
   const uint8_t* key_pkcs8_begin =
       reinterpret_cast<const uint8_t*>(key_pkcs8.data());
   std::vector<uint8_t> key_vector(key_pkcs8_begin,
                                   key_pkcs8_begin + key_pkcs8.length());
 
   crypto::ScopedSECKEYPrivateKey private_key(
       crypto::ImportNSSKeyFromPrivateKeyInfo(slot, key_vector,
                                              true /* permanent */));
   LOG_IF(ERROR, !private_key) << "Could not create key from file "
                               << key_path.value();
-  return private_key;
+  return !!private_key;
 }
 
 bool ImportClientCertToSlot(const scoped_refptr<X509Certificate>& cert,
                             PK11SlotInfo* slot) {
   std::string nickname = cert->GetDefaultNickname(USER_CERT);
   {
     crypto::AutoNSSWriteLock lock;
     SECStatus rv = PK11_ImportCert(slot,
                                    cert->os_cert_handle(),
                                    CK_INVALID_HANDLE,
@@ skipping 27 matching lines @@
   if (!ImportClientCertToSlot(cert, slot))
     return NULL;
 
   // |cert| continues to point to the original X509Certificate before the
   // import to |slot|. However this should not make a difference as NSS handles
   // state globally.
   return cert;
 }
 
 }  // namespace net