Refactor client cert private key handling.

chrome/browser/ui/crypto_module_delegate_nss.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_CRYPTO_MODULE_DELEGATE_NSS_H_
 #define CHROME_BROWSER_UI_CRYPTO_MODULE_DELEGATE_NSS_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 13 matching lines @@
 class ChromeNSSCryptoModuleDelegate
     : public crypto::NSSCryptoModuleDelegate {
  public:
   // Create a ChromeNSSCryptoModuleDelegate. |reason| is used to select what
   // string to show the user, |server| is displayed to indicate which connection
   // is causing the dialog to appear. |slot| can be NULL.
   ChromeNSSCryptoModuleDelegate(chrome::CryptoModulePasswordReason reason,
                                 const net::HostPortPair& server,
                                 crypto::ScopedPK11Slot slot);
 
-  ~ChromeNSSCryptoModuleDelegate() override;
-
   // Must be called on IO thread. Creates a delegate and returns it
   // synchronously or asynchronously to |callback|. If the delegate could not be
   // created, |callback| is called with NULL.
   static void CreateForResourceContext(
       chrome::CryptoModulePasswordReason reason,
       const net::HostPortPair& server,
       content::ResourceContext* context,
-      const base::Callback<
-          void(std::unique_ptr<ChromeNSSCryptoModuleDelegate>)>& callback);
+      const base::Callback<void(scoped_refptr<ChromeNSSCryptoModuleDelegate>)>&
+          callback);
 
   // crypto::NSSCryptoModuleDelegate implementation.
   crypto::ScopedPK11Slot RequestSlot() override;
 
   // crypto::CryptoModuleBlockingPasswordDelegate implementation.
   std::string RequestPassword(const std::string& slot_name,
                               bool retry,
                               bool* cancelled) override;
 
  private:
+  friend class base::RefCountedThreadSafe<ChromeNSSCryptoModuleDelegate>;
+
+  ~ChromeNSSCryptoModuleDelegate() override;
+
   void ShowDialog(const std::string& slot_name, bool retry);
 
   void GotPassword(const std::string& password);
 
   // Parameters displayed in the dialog.
   const chrome::CryptoModulePasswordReason reason_;
   net::HostPortPair server_;
 
   // Event to block worker thread while waiting for dialog on UI thread.
   base::WaitableEvent event_;
 
   // Stores the results from the dialog for access on worker thread.
   std::string password_;
   bool cancelled_;
 
   // The slot which will be returned by RequestSlot.
   crypto::ScopedPK11Slot slot_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeNSSCryptoModuleDelegate);
 };
 
 // Create a delegate which only handles unlocking slots.
 crypto::CryptoModuleBlockingPasswordDelegate*
     CreateCryptoModuleBlockingPasswordDelegate(
         chrome::CryptoModulePasswordReason reason,
         const net::HostPortPair& server);
 
 #endif  // CHROME_BROWSER_UI_CRYPTO_MODULE_DELEGATE_NSS_H_