Refactor client cert private key handling.

chrome/browser/ui/crypto_module_delegate_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 "chrome/browser/ui/crypto_module_delegate_nss.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "chrome/browser/net/nss_context.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace {
 
 void CreateWithSlot(
     chrome::CryptoModulePasswordReason reason,
     const net::HostPortPair& server,
-    const base::Callback<void(std::unique_ptr<ChromeNSSCryptoModuleDelegate>)>&
+    const base::Callback<void(scoped_refptr<ChromeNSSCryptoModuleDelegate>)>&
         callback,
     crypto::ScopedPK11Slot slot) {
   if (!slot) {
-    callback.Run(std::unique_ptr<ChromeNSSCryptoModuleDelegate>());
+    callback.Run(nullptr);
     return;
   }
-  callback.Run(std::unique_ptr<ChromeNSSCryptoModuleDelegate>(
-      new ChromeNSSCryptoModuleDelegate(reason, server, std::move(slot))));
+  callback.Run(base::MakeRefCounted<ChromeNSSCryptoModuleDelegate>(
+      reason, server, std::move(slot)));
 }
 
 }  // namespace
 
 ChromeNSSCryptoModuleDelegate::ChromeNSSCryptoModuleDelegate(
     chrome::CryptoModulePasswordReason reason,
     const net::HostPortPair& server,
     crypto::ScopedPK11Slot slot)
     : reason_(reason),
       server_(server),
       event_(base::WaitableEvent::ResetPolicy::AUTOMATIC,
              base::WaitableEvent::InitialState::NOT_SIGNALED),
       cancelled_(false),
       slot_(std::move(slot)) {}
 
 ChromeNSSCryptoModuleDelegate::~ChromeNSSCryptoModuleDelegate() {}
 
 // static
 void ChromeNSSCryptoModuleDelegate::CreateForResourceContext(
     chrome::CryptoModulePasswordReason reason,
     const net::HostPortPair& server,
     content::ResourceContext* context,
-    const base::Callback<void(std::unique_ptr<ChromeNSSCryptoModuleDelegate>)>&
+    const base::Callback<void(scoped_refptr<ChromeNSSCryptoModuleDelegate>)>&
         callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(!callback.is_null());
 
   base::Callback<void(crypto::ScopedPK11Slot)> get_slot_callback =
       base::Bind(&CreateWithSlot, reason, server, callback);
 
   crypto::ScopedPK11Slot slot =
       GetPrivateNSSKeySlotForResourceContext(context, get_slot_callback);
   if (slot)
     get_slot_callback.Run(std::move(slot));
 }
 
 // TODO(mattm): allow choosing which slot to generate and store the key.
 crypto::ScopedPK11Slot ChromeNSSCryptoModuleDelegate::RequestSlot() {

[davidben, 2017/06/07 23:06:17]

BTW, this slot was only used for <keygen> which is gone now. That means you can
get rid of the NSSCryptoModuleDelegate interface, which means you can get rid of
slot_, the constructor parameter,
ChromeNSSCryptoModuleDelegate::CreateForResourceContext, and everything!

[mattm, 2017/06/08 21:47:56]

Acknowledged.

   return std::move(slot_);
 }
 
 std::string ChromeNSSCryptoModuleDelegate::RequestPassword(
     const std::string& slot_name,
     bool retry,
     bool* cancelled) {
   DCHECK(!event_.IsSignaled());
   event_.Reset();
 
@@ skipping 36 matching lines @@
 crypto::CryptoModuleBlockingPasswordDelegate*
 CreateCryptoModuleBlockingPasswordDelegate(
     chrome::CryptoModulePasswordReason reason,
     const net::HostPortPair& server) {
   // Returns a ChromeNSSCryptoModuleDelegate without Pk11Slot. Since it is only
   // being used as a CryptoModuleBlockingDialogDelegate, using a slot handle is
   // unnecessary.
   return new ChromeNSSCryptoModuleDelegate(
       reason, server, crypto::ScopedPK11Slot());
 }