Fix CertLoader certificates_loaded() during notification.

Fix CertLoader certificates_loaded() during notification.

Also remove the conditional loading of certificates, which prevents tests including CertLoader.

BUG=NONE
R=stevenjb@chromium.org
TBR=xiyuan@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=214351

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=215873

[pneubeck (no reviews), 2013-07-26 19:08:57]

PTAL.
Still have to see if all tests run through.

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

https://codereview.chromium.org/20799002/diff/1/chromeos/cert_loader.cc
File chromeos/cert_loader.cc (right):

https://codereview.chromium.org/20799002/diff/1/chromeos/cert_loader.cc#newco...
chromeos/cert_loader.cc:348: NotifyCertificatesLoaded(certificates_loaded_);
This will never call NotifyCertificatesLoaded with initial_load == true...

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

PTAL.

https://codereview.chromium.org/20799002/diff/1/chromeos/cert_loader.cc
File chromeos/cert_loader.cc (right):

https://codereview.chromium.org/20799002/diff/1/chromeos/cert_loader.cc#newco...
chromeos/cert_loader.cc:348: NotifyCertificatesLoaded(certificates_loaded_);
On 2013/07/26 19:40:53, stevenjb (chromium) wrote:
> This will never call NotifyCertificatesLoaded with initial_load == true...

Oh. totally missed that.

[stevenjb, 2013-07-29 18:44:20]

lgtm

[pneubeck (no reviews), 2013-07-30 15:07:05]

Committed patchset #2 manually as r214351 (presubmit successful).

[commit-bot: I haz the power, 2013-07-30 16:26:39]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/pneubeck@chromium.org/20799002/10001

[commit-bot: I haz the power, 2013-07-30 16:26:45]

Failed to apply patch for chromeos/cert_loader.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chromeos/cert_loader.cc
  Hunk #1 FAILED at 44.
  Hunk #2 FAILED at 345.
  2 out of 2 hunks FAILED -- saving rejects to file chromeos/cert_loader.cc.rej

Patch:       chromeos/cert_loader.cc
Index: chromeos/cert_loader.cc
diff --git a/chromeos/cert_loader.cc b/chromeos/cert_loader.cc
index
ff57d36c1c2ec8a0a4e161d39bbbba38afd69091..33270d26615b01447b5b1a9bd2e0c8175f29c955
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_)

[pneubeck (no reviews), 2013-07-31 20:53:25]

PTAL.

Two more tests are broken, but these can be fixed/reviewed tomorrow by devs in
munich.

[stevenjb, 2013-07-31 22:02:03]

New changes lgtm

[commit-bot: I haz the power, 2013-08-06 04:49:38]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/pneubeck@chromium.org/20799002/31001

[commit-bot: I haz the power, 2013-08-06 05:00:44]

Retried try job too often on chromium_presubmit for step(s) presubmit
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=chromium_p...

[commit-bot: I haz the power, 2013-08-06 07:07:12]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/pneubeck@chromium.org/20799002/31001

[commit-bot: I haz the power, 2013-08-06 08:04:47]

Sorry for I got bad news for ya.
Compile failed with a clobber build on mac_rel.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-08-06 08:16:53]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/pneubeck@chromium.org/20799002/67001

[commit-bot: I haz the power, 2013-08-06 11:31:29]

Change committed as 215873