summaryrefslogtreecommitdiffstats
path: root/chromeos/cert_loader_unittest.cc
diff options
context:
space:
mode:
authortbarzic@chromium.org <tbarzic@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-06 10:24:11 +0000
committertbarzic@chromium.org <tbarzic@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-06 10:24:11 +0000
commit9e81893b54b4f48c7b18b783ed82208463fc5645 (patch)
treeb60309848866b1aa99547c0d4f5f56f230491514 /chromeos/cert_loader_unittest.cc
parent6e26d08a43a3a0126f5ff22a2f886597f8d304e3 (diff)
downloadchromium_src-9e81893b54b4f48c7b18b783ed82208463fc5645.zip
chromium_src-9e81893b54b4f48c7b18b783ed82208463fc5645.tar.gz
chromium_src-9e81893b54b4f48c7b18b783ed82208463fc5645.tar.bz2
Make NSSCertDatabase::ListCerts async and use the worker pool for actual certificate listing.
BUG=340460 TBR=sky@chromium.org (for rename in chrome/browser/certificate_manager_model.cc) Review URL: https://codereview.chromium.org/144423007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249334 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/cert_loader_unittest.cc')
-rw-r--r--chromeos/cert_loader_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromeos/cert_loader_unittest.cc b/chromeos/cert_loader_unittest.cc
index 2f28861..57def93 100644
--- a/chromeos/cert_loader_unittest.cc
+++ b/chromeos/cert_loader_unittest.cc
@@ -57,7 +57,6 @@ class CertLoaderTest : public testing::Test,
CertLoader::Initialize();
cert_loader_ = CertLoader::Get();
cert_loader_->AddObserver(this);
- cert_loader_->SetSlowTaskRunnerForTest(message_loop_.message_loop_proxy());
}
virtual void TearDown() {
@@ -108,6 +107,7 @@ class CertLoaderTest : public testing::Test,
database->reset(new net::NSSCertDatabaseChromeOS(
crypto::GetPublicSlotForChromeOSUser(user->username_hash()),
private_slot.Pass()));
+ (*database)->SetSlowTaskRunnerForTest(message_loop_.message_loop_proxy());
}
int GetDbPrivateSlotId(net::NSSCertDatabase* db) {