Fix flaky CertificateReportingService browser tests.

chrome/browser/safe_browsing/certificate_reporting_service.h

Index: chrome/browser/safe_browsing/certificate_reporting_service.h
diff --git a/chrome/browser/safe_browsing/certificate_reporting_service.h b/chrome/browser/safe_browsing/certificate_reporting_service.h
index 7137655e1e40e4bbc5117853a4af095773fb7076..79f7bf62ca7a206f50f576525cfe06577ae7cbf2 100644
--- a/chrome/browser/safe_browsing/certificate_reporting_service.h
+++ b/chrome/browser/safe_browsing/certificate_reporting_service.h
@@ -152,7 +152,8 @@ class CertificateReportingService : public KeyedService {
       uint32_t server_public_key_version,
       size_t max_queued_report_count,
       base::TimeDelta max_report_age,
-      base::Clock* clock);
+      base::Clock* clock,
+      const base::Callback<void()>& reset_callback);

[estark, 2017/01/05 16:42:28]

Instead of passing this to the constructor, would it work to have a separate
SetResetCallbackForTesting() method? (so that it's clear that it's used only for
tests?)

[meacer, 2017/01/05 20:15:46]

That used to be the case for most of the parameters of this class, but I wanted
to avoid that and push them to the factory instead.

The main reason was it became difficult to maintain all the different
parameters, but there is another reason here: The browser tests need to be able
to set this parameter before the service is created so that they can wait for
full initialization of the service before starting to send reports.

So adding a SetResetCallbackForTesting wouldn't work for that specific scenario
where the service isn't yet created. 

[estark, 2017/01/06 15:41:30]

Acknowledged.

 
   ~CertificateReportingService() override;
 
@@ -226,6 +227,9 @@ class CertificateReportingService : public KeyedService {
 
   base::Clock* const clock_;
 
+  // Called when the service is reset.

[estark, 2017/01/05 16:42:28]

nit: add "Used for testing"?

[meacer, 2017/01/05 20:15:46]

Done.

+  base::Callback<void()> reset_callback_;
+
   // Encryption parameters.
   uint8_t* server_public_key_;
   uint32_t server_public_key_version_;