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

Side by Side Diff: chromeos/cert_loader_unittest.cc

Issue 209263002: Merge 257570 "Handle cases when user cert database has NULL slots" (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1847/src/
Patch Set: Created 6 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chromeos/cert_loader.cc ('k') | chromeos/network/onc/onc_certificate_importer_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chromeos/cert_loader.h" 5 #include "chromeos/cert_loader.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "base/run_loop.h" 11 #include "base/run_loop.h"
12 #include "crypto/nss_util.h" 12 #include "crypto/nss_util.h"
13 #include "crypto/nss_util_internal.h" 13 #include "crypto/nss_util_internal.h"
14 #include "crypto/scoped_nss_types.h"
14 #include "net/base/net_errors.h" 15 #include "net/base/net_errors.h"
15 #include "net/base/test_data_directory.h" 16 #include "net/base/test_data_directory.h"
16 #include "net/cert/nss_cert_database_chromeos.h" 17 #include "net/cert/nss_cert_database_chromeos.h"
17 #include "net/cert/x509_certificate.h" 18 #include "net/cert/x509_certificate.h"
18 #include "net/test/cert_test_util.h" 19 #include "net/test/cert_test_util.h"
19 #include "testing/gtest/include/gtest/gtest.h" 20 #include "testing/gtest/include/gtest/gtest.h"
20 21
21 namespace chromeos { 22 namespace chromeos {
22 namespace { 23 namespace {
23 24
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 primary_db_->GetCertTrust(certs[0], net::CA_CERT)); 298 primary_db_->GetCertTrust(certs[0], net::CA_CERT));
298 ASSERT_TRUE(primary_db_->SetCertTrust( 299 ASSERT_TRUE(primary_db_->SetCertTrust(
299 certs[0], net::CA_CERT, net::NSSCertDatabase::TRUSTED_SSL)); 300 certs[0], net::CA_CERT, net::NSSCertDatabase::TRUSTED_SSL));
300 301
301 // Cert trust change should trigger certificate reload in cert_loader_. 302 // Cert trust change should trigger certificate reload in cert_loader_.
302 ASSERT_EQ(0U, GetAndResetCertificatesLoadedEventsCount()); 303 ASSERT_EQ(0U, GetAndResetCertificatesLoadedEventsCount());
303 base::RunLoop().RunUntilIdle(); 304 base::RunLoop().RunUntilIdle();
304 EXPECT_EQ(1U, GetAndResetCertificatesLoadedEventsCount()); 305 EXPECT_EQ(1U, GetAndResetCertificatesLoadedEventsCount());
305 } 306 }
306 307
308 TEST_F(CertLoaderTest, DatabaseWithUnsetSlots) {
309 primary_db_.reset(new net::NSSCertDatabaseChromeOS(crypto::ScopedPK11Slot(),
310 crypto::ScopedPK11Slot()));
311 primary_db_->SetSlowTaskRunnerForTest(message_loop_.message_loop_proxy());
312 cert_loader_->StartWithNSSDB(primary_db_.get());
313
314 base::RunLoop().RunUntilIdle();
315 EXPECT_EQ(1u, GetAndResetCertificatesLoadedEventsCount());
316
317 EXPECT_TRUE(cert_loader_->certificates_loaded());
318 EXPECT_EQ(-1, cert_loader_->TPMTokenSlotID());
319 EXPECT_FALSE(cert_loader_->IsHardwareBacked());
320 }
321
307 } // namespace 322 } // namespace
308 } // namespace chromeos 323 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/cert_loader.cc ('k') | chromeos/network/onc/onc_certificate_importer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698