Fix CertLoader certificates_loaded() during notification.

chromeos/cert_loader.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/cert_loader.h"
 
 #include <algorithm>
 
 #include "base/chromeos/chromeos_version.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ skipping 26 matching lines @@
 
   // Cap the delay to prevent an overflow. This threshold is arbitrarily chosen.
   const base::TimeDelta max_delay =
       base::TimeDelta::FromMilliseconds(kMaxRequestDelayMs);
   if (next_delay > max_delay)
     next_delay = max_delay;
   return next_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() {
   // Called from crypto_task_runner_.
   VLOG(1) << "CallOpenPersistentNSSDB";
 
   // Ensure we've opened the user's key/certificate database.
   crypto::OpenPersistentNSSDB();
   if (base::chromeos::IsRunningOnChromeOS())
     crypto::EnableTPMTokenForNSS();
@@ skipping 279 matching lines @@
 }
 
 void CertLoader::UpdateCertificates(net::CertificateList* cert_list) {
   CHECK(thread_checker_.CalledOnValidThread());
   DCHECK(certificates_update_running_);
   VLOG(1) << "UpdateCertificates: " << cert_list->size();
 
   // Ignore any existing certificates.
   cert_list_.swap(*cert_list);
 
-  NotifyCertificatesLoaded(!certificates_loaded_);
   certificates_loaded_ = true;
+  NotifyCertificatesLoaded(certificates_loaded_);

[stevenjb, 2013/07/26 19:40:53]

This will never call NotifyCertificatesLoaded with initial_load == true...

[pneubeck (no reviews), 2013/07/29 06:19:40]

Oh. totally missed that.

 
   certificates_update_running_ = false;
   if (certificates_update_required_)
     StartLoadCertificates();
 }
 
 void CertLoader::NotifyCertificatesLoaded(bool initial_load) {
   FOR_EACH_OBSERVER(Observer, observers_,
                     OnCertificatesLoaded(cert_list_, initial_load));
 }
@@ skipping 10 matching lines @@
   VLOG(1) << "OnCertRemoved";
   StartLoadCertificates();
 }
 
 void CertLoader::LoggedInStateChanged(LoginState::LoggedInState state) {
   VLOG(1) << "LoggedInStateChanged: " << state;
   MaybeRequestCertificates();
 }
 
 }  // namespace chromeos