net: remove CryptoModuleList typedef

chrome/browser/certificate_manager_model.cc

 // Copyright (c) 2012 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/certificate_manager_model.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/i18n/time_formatting.h"
@@ skipping 97 matching lines @@
                                           extension_certificate_provider)),
       weak_ptr_factory_(this) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 }
 
 CertificateManagerModel::~CertificateManagerModel() {
 }
 
 void CertificateManagerModel::Refresh() {
   DVLOG(1) << "refresh started";
-  net::CryptoModuleList modules;
+  std::vector<crypto::ScopedPK11Slot> modules;
   cert_db_->ListModules(&modules, false);
   DVLOG(1) << "refresh waiting for unlocking...";
   chrome::UnlockSlotsIfNecessary(
-      modules,
-      chrome::kCryptoModulePasswordListCerts,
+      std::move(modules), chrome::kCryptoModulePasswordListCerts,
       net::HostPortPair(),  // unused.
-      NULL, // TODO(mattm): supply parent window.
+      NULL,                 // TODO(mattm): supply parent window.
       base::Bind(&CertificateManagerModel::RefreshSlotsUnlocked,
                  base::Unretained(this)));
 
 #if defined(OS_CHROMEOS)
   extension_certificate_provider_->GetCertificates(base::Bind(
       &CertificateManagerModel::RefreshExtensionCertificates,
       weak_ptr_factory_.GetWeakPtr()));
 #endif
 }
 
@@ skipping 193 matching lines @@
   net::NSSCertDatabase* cert_db = GetNSSCertDatabaseForResourceContext(
       context, did_get_cert_db_callback);
 
   // The callback is run here instead of the actual function call because of
   // extension_certificate_provider ownership semantics, ie. ownership can only
   // be released once. The callback will only be run once (either inside the
   // function above or here).
   if (cert_db)
     did_get_cert_db_callback.Run(cert_db);
 }