diff options
| author | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-30 15:07:00 +0000 |
|---|---|---|
| committer | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-30 15:07:00 +0000 |
| commit | b554d462229e4498ba6576d7cd0c2336fb468175 (patch) | |
| tree | edcde0d07176b24ca548e1b7e30e9d7fec52ee89 /chromeos | |
| parent | 8047f78d04893c7c30c4b97b37148d00671fb335 (diff) | |
| download | chromium_src-b554d462229e4498ba6576d7cd0c2336fb468175.zip chromium_src-b554d462229e4498ba6576d7cd0c2336fb468175.tar.gz chromium_src-b554d462229e4498ba6576d7cd0c2336fb468175.tar.bz2 | |
Fix CertLoader certificates_loaded() during notification.
Also remove the conditional loading of certificates, which prevents tests including CertLoader.
BUG=NONE
R=stevenjb@chromium.org
Review URL: https://codereview.chromium.org/20799002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214351 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/cert_loader.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chromeos/cert_loader.cc b/chromeos/cert_loader.cc index ff57d36..33270d2 100644 --- a/chromeos/cert_loader.cc +++ b/chromeos/cert_loader.cc @@ -44,8 +44,7 @@ base::TimeDelta GetNextRequestDelayMs(base::TimeDelta last_delay) { } void LoadNSSCertificates(net::CertificateList* cert_list) { - if (base::chromeos::IsRunningOnChromeOS()) - net::NSSCertDatabase::GetInstance()->ListCerts(cert_list); + net::NSSCertDatabase::GetInstance()->ListCerts(cert_list); } void CallOpenPersistentNSSDB() { @@ -345,8 +344,9 @@ void CertLoader::UpdateCertificates(net::CertificateList* cert_list) { // Ignore any existing certificates. cert_list_.swap(*cert_list); - NotifyCertificatesLoaded(!certificates_loaded_); + bool initial_load = !certificates_loaded_; certificates_loaded_ = true; + NotifyCertificatesLoaded(initial_load); certificates_update_running_ = false; if (certificates_update_required_) |