NSS: Unlock crypto devices when populating cert manager.

chrome/browser/webui/options/certificate_manager_handler.cc

 // Copyright (c) 2011 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/webui/options/certificate_manager_handler.h"
 
 #include "base/file_util.h"  // for FileAccessProvider
 #include "base/safe_strerror_posix.h"
 #include "base/scoped_vector.h"
 #include "base/string_number_conversions.h"
@@ skipping 514 matching lines @@
 
 void CertificateManagerHandler::ExportPersonalPasswordSelected(
     const ListValue* args) {
   if (!args->GetString(0, &password_)){
     web_ui_->CallJavascriptFunction(L"CertificateRestoreOverlay.dismiss");
     ImportExportCleanup();
     return;
   }
 
   // Currently, we don't support exporting more than one at a time.  If we do,
-  // this would need some cleanup to handle unlocking multiple slots.
+  // this would need to either change this to use UnlockSlotsIfNecessary or
+  // change UnlockCertSlotIfNecessary to take a CertificateList.
   DCHECK_EQ(selected_cert_list_.size(), 1U);
 
   // TODO(mattm): do something smarter about non-extractable keys
   browser::UnlockCertSlotIfNecessary(
       selected_cert_list_[0].get(),
       browser::kCryptoModulePasswordCertExport,
       "",  // unused.
       NewCallback(this,
                   &CertificateManagerHandler::ExportPersonalSlotsUnlocked));
 }
@@ skipping 76 matching lines @@
         l10n_util::GetStringFUTF8(IDS_CERT_MANAGER_READ_ERROR_FORMAT,
                                   UTF8ToUTF16(safe_strerror(read_errno))));
     return;
   }
 
   file_data_ = data;
 
   // TODO(mattm): allow user to choose a slot to import to.
   module_ = certificate_manager_model_->cert_db().GetDefaultModule();
 
-  browser::UnlockSlotIfNecessary(
-      module_.get(),
+  net::CryptoModuleList modules;
+  modules.push_back(module_);
+  browser::UnlockSlotsIfNecessary(
+      modules,
       browser::kCryptoModulePasswordCertImport,
       "",  // unused.
       NewCallback(this,
                   &CertificateManagerHandler::ImportPersonalSlotUnlocked));
 }
 
 void CertificateManagerHandler::ImportPersonalSlotUnlocked() {
   int result = certificate_manager_model_->ImportFromPKCS12(
       module_, file_data_, password_);
   ImportExportCleanup();
@@ skipping 285 matching lines @@
   StringValue error_value(error);
   web_ui_->CallJavascriptFunction(L"CertificateImportErrorOverlay.show",
                                   title_value,
                                   error_value,
                                   cert_error_list);
 }
 
 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const {
   return web_ui_->tab_contents()->view()->GetTopLevelNativeWindow();
 }