net: remove CryptoModuleList typedef

net/cert/nss_cert_database_chromeos_unittest.cc

Index: net/cert/nss_cert_database_chromeos_unittest.cc
diff --git a/net/cert/nss_cert_database_chromeos_unittest.cc b/net/cert/nss_cert_database_chromeos_unittest.cc
index e5e360670457904265c591026f31ee16045e31f2..63efaaebf0fcf47fdf2e27b63f578b60355daac4 100644
--- a/net/cert/nss_cert_database_chromeos_unittest.cc
+++ b/net/cert/nss_cert_database_chromeos_unittest.cc
@@ -108,26 +108,26 @@ class NSSCertDatabaseChromeOSTest : public testing::Test,
 // 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);