Remove certificate reporting code from SafeBrowsing ping and ui managers

chrome/browser/safe_browsing/ping_manager.cc

Index: chrome/browser/safe_browsing/ping_manager.cc
diff --git a/chrome/browser/safe_browsing/ping_manager.cc b/chrome/browser/safe_browsing/ping_manager.cc
index 137d884938fca01e4343849484d6bd5e47ec5940..2a42e9bbafbfa975000b387d50374c3bff5832dc 100644
--- a/chrome/browser/safe_browsing/ping_manager.cc
+++ b/chrome/browser/safe_browsing/ping_manager.cc
@@ -9,13 +9,10 @@
 #include "base/base64.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
-#include "base/metrics/histogram_macros.h"
-#include "base/metrics/sparse_histogram.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/safe_browsing/permission_reporter.h"
-#include "components/certificate_reporting/error_reporter.h"
 #include "components/data_use_measurement/core/data_use_user_data.h"
 #include "content/public/browser/browser_thread.h"
 #include "google_apis/google_api_keys.h"
@@ -23,7 +20,6 @@
 #include "net/base/load_flags.h"
 #include "net/log/net_log_source_type.h"
 #include "net/ssl/ssl_info.h"
-#include "net/url_request/report_sender.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
@@ -33,13 +29,6 @@
 using content::BrowserThread;
 
 namespace {
-// URL to upload invalid certificate chain reports. An HTTP URL is
-// used because a client seeing an invalid cert might not be able to
-// make an HTTPS connection to report it.
-const char kExtendedReportingUploadUrlInsecure[] =
-    "http://safebrowsing.googleusercontent.com/safebrowsing/clientreport/"
-    "chrome-certs";
-
 // Returns a dictionary with "url"=|url-spec| and "data"=|payload| for
 // netlogging the start phase of a ping.
 std::unique_ptr<base::Value> NetLogPingStartCallback(
@@ -69,12 +58,6 @@ std::unique_ptr<base::Value> NetLogPingEndCallback(
   return std::move(event_params);
 }
 
-// Records an UMA histogram of the net errors when certificate reports
-// fail to send.
-void RecordUMAOnFailure(const GURL& report_uri, int net_error) {
-  UMA_HISTOGRAM_SPARSE_SLOWLY("SSL.CertificateErrorReportFailure", -net_error);
-}
-
 }  // namespace
 
 namespace safe_browsing {
@@ -99,14 +82,6 @@ SafeBrowsingPingManager::SafeBrowsingPingManager(
   DCHECK(!url_prefix_.empty());
 
   if (request_context_getter) {
-    const net::ReportSender::CookiesPreference cookies_preference =
-        net::ReportSender::DO_NOT_SEND_COOKIES;
-    const GURL certificate_upload_url(kExtendedReportingUploadUrlInsecure);
-
-    certificate_error_reporter_.reset(new certificate_reporting::ErrorReporter(
-        request_context_getter->GetURLRequestContext(), certificate_upload_url,
-        cookies_preference));
-
     permission_reporter_.reset(
         new PermissionReporter(request_context_getter->GetURLRequestContext()));
 
@@ -190,19 +165,6 @@ void SafeBrowsingPingManager::ReportThreatDetails(const std::string& report) {
   safebrowsing_reports_.insert(std::move(fetcher));
 }
 
-void SafeBrowsingPingManager::ReportInvalidCertificateChain(
-    const std::string& serialized_report) {
-  DCHECK(certificate_error_reporter_);
-  certificate_error_reporter_->SendExtendedReportingReport(
-      serialized_report, base::Closure(), base::Bind(RecordUMAOnFailure));
-}
-
-void SafeBrowsingPingManager::SetCertificateErrorReporterForTesting(
-    std::unique_ptr<certificate_reporting::ErrorReporter>
-        certificate_error_reporter) {
-  certificate_error_reporter_ = std::move(certificate_error_reporter);
-}
-
 void SafeBrowsingPingManager::ReportPermissionAction(
     const PermissionReportInfo& report_info) {
   permission_reporter_->SendReport(report_info);