Index: chrome/browser/browsing_data/browsing_data_remover_unittest.cc |
diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc |
index 9f8ceded29de317d709eaf11c72344d6b6bdf166..ad98c33e617d9bf04a32e6f532441c0c4dda14ab 100644 |
--- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc |
+++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc |
@@ -297,6 +297,11 @@ class RemoveServerBoundCertTester : public net::SSLConfigService::Observer { |
now + base::TimeDelta::FromDays(1)); |
} |
+ void GetCertList(net::ServerBoundCertStore::ServerBoundCertList* certs) { |
+ GetCertStore()->GetAllServerBoundCerts( |
+ base::Bind(&RemoveServerBoundCertTester::GetAllCertsCallback, certs)); |
+ } |
+ |
net::ServerBoundCertStore* GetCertStore() { |
return server_bound_cert_service_->GetCertStore(); |
} |
@@ -311,6 +316,12 @@ class RemoveServerBoundCertTester : public net::SSLConfigService::Observer { |
} |
private: |
+ static void GetAllCertsCallback( |
+ net::ServerBoundCertStore::ServerBoundCertList* dest, |
+ const net::ServerBoundCertStore::ServerBoundCertList& result) { |
+ *dest = result; |
+ } |
+ |
net::ServerBoundCertService* server_bound_cert_service_; |
scoped_refptr<net::SSLConfigService> ssl_config_service_; |
int ssl_config_changed_count_; |
@@ -711,7 +722,8 @@ TEST_F(BrowsingDataRemoverTest, RemoveServerBoundCertLastHour) { |
EXPECT_EQ(1, tester.ssl_config_changed_count()); |
ASSERT_EQ(1, tester.ServerBoundCertCount()); |
net::ServerBoundCertStore::ServerBoundCertList certs; |
- tester.GetCertStore()->GetAllServerBoundCerts(&certs); |
+ tester.GetCertList(&certs); |
+ ASSERT_EQ(1U, certs.size()); |
EXPECT_EQ(kTestOrigin2, certs.front().server_identifier()); |
} |