Wire up CertificateReportingService to handle report uploads

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 2d7a02d61fe879e4dd3f804febcb773bdd14a7b8..e6367bc0dd76694bf42b075526f6becde54b165b 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -72,6 +72,8 @@
 #include "chrome/browser/renderer_host/chrome_navigation_ui_data.h"
 #include "chrome/browser/renderer_host/chrome_render_message_filter.h"
 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h"
+#include "chrome/browser/safe_browsing/certificate_reporting_service.h"
+#include "chrome/browser/safe_browsing/certificate_reporting_service_factory.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"

[estark, 2016/12/16 01:57:58]

can be removed now?

[meacer, 2016/12/16 20:26:35]

Done.

 #include "chrome/browser/safe_browsing/ui_manager.h"

[estark, 2016/12/16 01:57:58]

ditto

[meacer, 2016/12/16 20:26:35]

Done.

 #include "chrome/browser/search/instant_service.h"
@@ -141,6 +143,7 @@
 #include "components/rappor/public/rappor_utils.h"
 #include "components/rappor/rappor_recorder_impl.h"
 #include "components/rappor/rappor_service_impl.h"
+#include "components/safe_browsing_db/safe_browsing_prefs.h"
 #include "components/security_interstitials/core/ssl_error_ui.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "components/spellcheck/spellcheck_build_features.h"
@@ -667,28 +670,24 @@ void HandleFlashDownloadActionOnUIThread(int render_process_id,
 #endif  // BUILDFLAG(ENABLE_PLUGINS)
 
 // An implementation of the SSLCertReporter interface used by
-// SSLErrorHandler. Uses the SafeBrowsing UI manager to send invalid
-// certificate reports.
-class SafeBrowsingSSLCertReporter : public SSLCertReporter {
+// SSLErrorHandler. Uses CertificateReportingService to send reports. The
+// service handles queueing and re-sending of failed reports. Each certificate
+// error creates a new instance of this class.
+class CertificateReportingServiceCertReporter : public SSLCertReporter {

[estark, 2016/12/16 01:57:58]

Hrmmmmm. There is not much reason for this SSLCertReporter interface to exist
anymore. CertReportHelper in chrome/browser/ssl could just using the
CertificateReportingService directly.

We originally did this SSLCertReporter interface to avoid introducing a c/b/ssl
-> c/b/safe_browsing dependency... but now c/b/ssl depends on c/b/safe_browsing
all over the place.

So we could get rid of this interface. Or we could leave it as you have it and
file a bug to clean up the c/b/ssl => c/b/safe_browsing dependency. (I don't
think it would be that hard to clean it up.) I have a slight preference for the
latter, since it is kinda weird that c/b/ssl depends on safebrowsing. Do you
have any preference?

[meacer, 2016/12/16 20:26:35]

I've been avoiding adding more c/b/sb dependency to ssl so I'd prefer cleaning
out the dependencies instead.

As far as I can tell, the only dependencies are in tests and one other place
which I removed in the next CL
(chrome/browser/ssl/certificate_reporting_test_utils.cc). The rest of the code
in ssl depends on components/safe_browsing_db instead. But maybe I'm missing
something?

[estark, 2016/12/16 23:39:03]

I think removing the safe_browsing_db ones would be a reasonable thing to do
too, if possible. I filed a bug to look into it:
https://bugs.chromium.org/p/chromium/issues/detail?id=675245

  public:
-  explicit SafeBrowsingSSLCertReporter(
-      const scoped_refptr<safe_browsing::SafeBrowsingUIManager>&
-          safe_browsing_ui_manager)
-      : safe_browsing_ui_manager_(safe_browsing_ui_manager) {}
-  ~SafeBrowsingSSLCertReporter() override {}
+  explicit CertificateReportingServiceCertReporter(
+      CertificateReportingService* service)
+      : service_(service) {}
+  ~CertificateReportingServiceCertReporter() override {}
 
   // SSLCertReporter implementation
   void ReportInvalidCertificateChain(
       const std::string& serialized_report) override {
-    if (safe_browsing_ui_manager_) {
-      safe_browsing_ui_manager_->ReportInvalidCertificateChain(
-          serialized_report, base::Bind(&base::DoNothing));
-    }
+    service_->Send(serialized_report);
   }
 
  private:
-  const scoped_refptr<safe_browsing::SafeBrowsingUIManager>
-      safe_browsing_ui_manager_;
+  CertificateReportingService* service_;
 };
 
 #if BUILDFLAG(ANDROID_JAVA_UI)
@@ -2215,12 +2214,12 @@ void ChromeContentBrowserClient::AllowCertificateError(
   if (expired_previous_decision)
     options_mask |= SSLErrorUI::EXPIRED_BUT_PREVIOUSLY_ALLOWED;
 
-  safe_browsing::SafeBrowsingService* safe_browsing_service =
-      g_browser_process->safe_browsing_service();
-  std::unique_ptr<SafeBrowsingSSLCertReporter> cert_reporter(
-      new SafeBrowsingSSLCertReporter(safe_browsing_service
-                                          ? safe_browsing_service->ui_manager()
-                                          : nullptr));
+  CertificateReportingService* cert_reporting_service =
+      CertificateReportingServiceFactory::GetForBrowserContext(
+          web_contents->GetBrowserContext());
+  std::unique_ptr<CertificateReportingServiceCertReporter> cert_reporter(
+      new CertificateReportingServiceCertReporter(cert_reporting_service));
+
   SSLErrorHandler::HandleSSLError(web_contents, cert_error, ssl_info,
                                   request_url, options_mask,
                                   std::move(cert_reporter), callback);