Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3543)

Unified Diff: chrome/browser/browsing_data/browsing_data_remover_unittest.cc

Issue 11742037: Make ServerBoundCertStore interface async, move SQLiteServerBoundCertStore load onto DB thread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 6ad351beffbbb8d3e13f0228e13e5016a8bec6d6..78cbaee616c944fd46b5b3323e3bbb83ebf8b088 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
@@ -298,6 +298,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();
}
@@ -312,6 +317,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_;
@@ -712,7 +723,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());
}

Powered by Google App Engine
This is Rietveld 408576698