diff options
| author | jwd@chromium.org <jwd@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-30 16:47:07 +0000 |
|---|---|---|
| committer | jwd@chromium.org <jwd@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-30 16:47:07 +0000 |
| commit | 787a5e6f02cf4e2a4068802d58432171fd70d2d1 (patch) | |
| tree | d7cb521faa449a68b79fd594bd039ba13d2991aa /chromeos | |
| parent | ca22d082ed44a470f3bf920e72b9a98cf2e97563 (diff) | |
| download | chromium_src-787a5e6f02cf4e2a4068802d58432171fd70d2d1.zip chromium_src-787a5e6f02cf4e2a4068802d58432171fd70d2d1.tar.gz chromium_src-787a5e6f02cf4e2a4068802d58432171fd70d2d1.tar.bz2 | |
Revert 214351 "Fix CertLoader certificates_loaded() during notif..."
> 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
This is intended to fix issues in browser_tests on Linux ChromiumOS Tests(2) where webui tests were failing.
TBR=pneubeck@chromium.org
Review URL: https://codereview.chromium.org/21123009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214364 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 33270d2..ff57d36 100644 --- a/chromeos/cert_loader.cc +++ b/chromeos/cert_loader.cc @@ -44,7 +44,8 @@ base::TimeDelta GetNextRequestDelayMs(base::TimeDelta last_delay) { } void LoadNSSCertificates(net::CertificateList* cert_list) { - net::NSSCertDatabase::GetInstance()->ListCerts(cert_list); + if (base::chromeos::IsRunningOnChromeOS()) + net::NSSCertDatabase::GetInstance()->ListCerts(cert_list); } void CallOpenPersistentNSSDB() { @@ -344,9 +345,8 @@ void CertLoader::UpdateCertificates(net::CertificateList* cert_list) { // Ignore any existing certificates. cert_list_.swap(*cert_list); - bool initial_load = !certificates_loaded_; + NotifyCertificatesLoaded(!certificates_loaded_); certificates_loaded_ = true; - NotifyCertificatesLoaded(initial_load); certificates_update_running_ = false; if (certificates_update_required_) |