diff options
| author | pneubeck <pneubeck@chromium.org> | 2014-11-06 02:56:19 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-06 10:57:18 +0000 |
| commit | ad2f21668af6195ca662136305a029e0331c3d20 (patch) | |
| tree | 37f9951085e9c8dfb813a435423bbc13815d046f /chromeos/cert_loader_unittest.cc | |
| parent | 758abebc6360e6c4bad50acd851a0c41c85695ac (diff) | |
| download | chromium_src-ad2f21668af6195ca662136305a029e0331c3d20.zip chromium_src-ad2f21668af6195ca662136305a029e0331c3d20.tar.gz chromium_src-ad2f21668af6195ca662136305a029e0331c3d20.tar.bz2 | |
ClientCertResolver: Remove IsHardwareBacked check.
There were two methods: one to check whether the hardware backed crypto token is loaded at all and one to check whether an individual certificate is hardware backed.
These were not consistently used by ClientCertResolver and the network configuration UI.
Now always individual certificates are checked to be hardware backed and the IsHardwareBacked method is removed from CertLoader.
For upcoming changes, it's also required that ClientCertResolver notifies observers even if no certificate patterns were resolved or no hardware token is present. Therefore, the check for IsHardwareBacked is removed.
BUG=424036
Review URL: https://codereview.chromium.org/699073003
Cr-Commit-Position: refs/heads/master@{#303005}
Diffstat (limited to 'chromeos/cert_loader_unittest.cc')
| -rw-r--r-- | chromeos/cert_loader_unittest.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chromeos/cert_loader_unittest.cc b/chromeos/cert_loader_unittest.cc index e614198..f4366d4 100644 --- a/chromeos/cert_loader_unittest.cc +++ b/chromeos/cert_loader_unittest.cc @@ -178,7 +178,6 @@ class CertLoaderTest : public testing::Test, TEST_F(CertLoaderTest, Basic) { EXPECT_FALSE(cert_loader_->CertificatesLoading()); EXPECT_FALSE(cert_loader_->certificates_loaded()); - EXPECT_FALSE(cert_loader_->IsHardwareBacked()); FinishUserInitAndGetDatabase(&primary_user_, &primary_db_); @@ -217,6 +216,8 @@ TEST_F(CertLoaderTest, CertLoaderUpdatesCertListOnNewCert) { // The certificate list should be updated now, as the message loop's been run. EXPECT_TRUE( IsCertInCertificateList(certs[0].get(), cert_loader_->cert_list())); + + EXPECT_FALSE(cert_loader_->IsCertificateHardwareBacked(certs[0].get())); } TEST_F(CertLoaderTest, CertLoaderNoUpdateOnSecondaryDbChanges) { |