Remove OnCertDBChanged |cert| parameter.

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 34 matching lines @@
 }
 
 }  // namespace
 
 class NSSCertDatabaseChromeOSTest : public testing::Test,
                                     public CertDatabase::Observer {
  public:
   NSSCertDatabaseChromeOSTest()
       : scoped_task_scheduler_(base::MessageLoop::current()),
         observer_added_(false),
+        db_changed_count_(0),
         user_1_("user1"),
         user_2_("user2") {}
 
   void SetUp() override {
     // Initialize nss_util slots.
     ASSERT_TRUE(user_1_.constructed_successfully());
     ASSERT_TRUE(user_2_.constructed_successfully());
     user_1_.FinishInit();
     user_2_.FinishInit();
 
@@ skipping 16 matching lines @@
     CertDatabase::GetInstance()->AddObserver(this);
     observer_added_ = true;
   }
 
   void TearDown() override {
     if (observer_added_)
       CertDatabase::GetInstance()->RemoveObserver(this);
   }
 
   // CertDatabase::Observer:
-  void OnCertDBChanged(const X509Certificate* cert) override {
-    added_ca_.push_back(cert ? cert->os_cert_handle() : NULL);
-  }
+  void OnCertDBChanged() override { db_changed_count_++; }
 
  protected:
   base::test::ScopedTaskScheduler scoped_task_scheduler_;
 
   bool observer_added_;
-  // Certificates that were passed to the CertDatabase observers.
-  std::vector<CERTCertificate*> added_ca_;
+  int db_changed_count_;
 
   crypto::ScopedTestNSSChromeOSUser user_1_;
   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
@@ skipping 61 matching lines @@
   // imported them.
   EXPECT_TRUE(IsCertInCertificateList(certs_1[0].get(), user_1_certlist));
   EXPECT_FALSE(IsCertInCertificateList(certs_1[0].get(), user_2_certlist));
 
   EXPECT_TRUE(IsCertInCertificateList(certs_2[0].get(), user_2_certlist));
   EXPECT_FALSE(IsCertInCertificateList(certs_2[0].get(), user_1_certlist));
 
   // Run the message loop so the observer notifications get processed.
   base::RunLoop().RunUntilIdle();
   // Should have gotten two OnCertDBChanged notifications.
-  ASSERT_EQ(2U, added_ca_.size());
-  // TODO(mattm): make NSSCertDatabase actually pass the cert to the callback,
-  // and enable these checks:
-  // EXPECT_EQ(certs_1[0]->os_cert_handle(), added_ca_[0]);
-  // EXPECT_EQ(certs_2[0]->os_cert_handle(), added_ca_[1]);
+  ASSERT_EQ(2, db_changed_count_);
 
   // Tests that the new certs are loaded by async ListCerts method.
   CertificateList user_1_certlist_async;
   CertificateList user_2_certlist_async;
   db_1_->ListCerts(
       base::Bind(&SwapCertLists, base::Unretained(&user_1_certlist_async)));
   db_2_->ListCerts(
       base::Bind(&SwapCertLists, base::Unretained(&user_2_certlist_async)));
 
   base::RunLoop().RunUntilIdle();
@@ skipping 43 matching lines @@
   EXPECT_TRUE(IsCertInCertificateList(certs_1[0].get(), user_1_certlist));
   EXPECT_FALSE(IsCertInCertificateList(certs_1[0].get(), user_2_certlist));
 
   EXPECT_TRUE(IsCertInCertificateList(certs_2[0].get(), user_2_certlist));
   EXPECT_FALSE(IsCertInCertificateList(certs_2[0].get(), user_1_certlist));
 
   // Run the message loop so the observer notifications get processed.
   base::RunLoop().RunUntilIdle();
   // TODO(mattm): ImportServerCert doesn't actually cause any observers to
   // fire. Is that correct?
-  EXPECT_EQ(0U, added_ca_.size());
+  EXPECT_EQ(0, db_changed_count_);
 
   // Tests that the new certs are loaded by async ListCerts method.
   CertificateList user_1_certlist_async;
   CertificateList user_2_certlist_async;
   db_1_->ListCerts(
       base::Bind(&SwapCertLists, base::Unretained(&user_1_certlist_async)));
   db_2_->ListCerts(
       base::Bind(&SwapCertLists, base::Unretained(&user_2_certlist_async)));
 
   base::RunLoop().RunUntilIdle();
@@ skipping 51 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