net: remove CryptoModuleList typedef

net/cert/nss_cert_database_chromeos_unittest.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 "net/cert/nss_cert_database_chromeos.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 90 matching lines @@
   crypto::ScopedTestNSSChromeOSUser user_2_;
   crypto::ScopedTestNSSDB system_db_;
   std::unique_ptr<NSSCertDatabaseChromeOS> db_1_;
   std::unique_ptr<NSSCertDatabaseChromeOS> db_2_;
 };
 
 // Test that ListModules() on each user includes that user's NSS software slot,
 // and does not include the software slot of the other user. (Does not check the
 // private slot, since it is the same as the public slot in tests.)
 TEST_F(NSSCertDatabaseChromeOSTest, ListModules) {
-  CryptoModuleList modules_1;
-  CryptoModuleList modules_2;
+  std::vector<crypto::ScopedPK11Slot> modules_1;
+  std::vector<crypto::ScopedPK11Slot> modules_2;
 
   db_1_->ListModules(&modules_1, false /* need_rw */);
   db_2_->ListModules(&modules_2, false /* need_rw */);
 
   bool found_1 = false;
-  for (CryptoModuleList::iterator it = modules_1.begin(); it != modules_1.end();
-       ++it) {
-    EXPECT_NE(db_2_->GetPublicSlot().get(), (*it)->os_module_handle());
-    if ((*it)->os_module_handle() == db_1_->GetPublicSlot().get())
+  for (std::vector<crypto::ScopedPK11Slot>::iterator it = modules_1.begin();
+       it != modules_1.end(); ++it) {
+    EXPECT_NE(db_2_->GetPublicSlot().get(), (*it).get());
+    if ((*it).get() == db_1_->GetPublicSlot().get())
       found_1 = true;
   }
   EXPECT_TRUE(found_1);
 
   bool found_2 = false;
-  for (CryptoModuleList::iterator it = modules_2.begin(); it != modules_2.end();
-       ++it) {
-    EXPECT_NE(db_1_->GetPublicSlot().get(), (*it)->os_module_handle());
-    if ((*it)->os_module_handle() == db_2_->GetPublicSlot().get())
+  for (std::vector<crypto::ScopedPK11Slot>::iterator it = modules_2.begin();
+       it != modules_2.end(); ++it) {
+    EXPECT_NE(db_1_->GetPublicSlot().get(), (*it).get());
+    if ((*it).get() == db_2_->GetPublicSlot().get())
       found_2 = true;
   }
   EXPECT_TRUE(found_2);
 }
 
 // Test that ImportCACerts imports the cert to the correct slot, and that
 // ListCerts includes the added cert for the correct user, and does not include
 // it for the other user.
 TEST_F(NSSCertDatabaseChromeOSTest, ImportCACerts) {
   // Load test certs from disk.
@@ skipping 165 matching lines @@
                                      "client_2.pem",
                                      "client_2.pk8",
                                      system_db_.slot()));
   CertificateList certs;
   db_2_->ListCertsSync(&certs);
   EXPECT_TRUE(IsCertInCertificateList(cert_1.get(), certs));
   EXPECT_FALSE(IsCertInCertificateList(cert_2.get(), certs));
 }
 
 }  // namespace net