Revert of Encrypt certificate reports before uploading to HTTP URLs

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 dba45aebf34d253c36fee2388f04f96752dea79f..f8335d748a4872d359d424c926c2ac5cc383921a 100644
--- a/chrome/browser/safe_browsing/ping_manager.cc
+++ b/chrome/browser/safe_browsing/ping_manager.cc
@@ -24,12 +24,8 @@
 using content::BrowserThread;
 
 namespace {
-// URLs to upload invalid certificate chain reports. The HTTP URL is
-// preferred since a client seeing an invalid cert might not be able to
-// make an HTTPS connection to report it.
-// TODO(estark): insert the production HTTP URL when it's ready
-const char kExtendedReportingUploadUrlInsecure[] = "";
-const char kExtendedReportingUploadUrlSecure[] =
+// URL to upload invalid certificate chain reports
+const char kExtendedReportingUploadUrl[] =
     "https://sb-ssl.google.com/safebrowsing/clientreport/chrome-certs";
 }  // namespace
 
@@ -48,21 +44,15 @@
     const SafeBrowsingProtocolConfig& config)
     : client_name_(config.client_name),
       request_context_getter_(request_context_getter),
-      url_prefix_(config.url_prefix) {
+      url_prefix_(config.url_prefix),
+      certificate_error_reporter_(
+          request_context_getter
+              ? new CertificateErrorReporter(
+                    request_context_getter->GetURLRequestContext(),
+                    GURL(kExtendedReportingUploadUrl),
+                    CertificateErrorReporter::SEND_COOKIES)
+              : nullptr) {
   DCHECK(!url_prefix_.empty());
-
-  if (request_context_getter) {
-    bool use_insecure_certificate_upload_url =
-        CertificateErrorReporter::IsHttpUploadUrlSupported() &&
-        strlen(kExtendedReportingUploadUrlInsecure) > 0;
-    GURL certificate_upload_url(use_insecure_certificate_upload_url
-                                    ? kExtendedReportingUploadUrlInsecure
-                                    : kExtendedReportingUploadUrlSecure);
-
-    certificate_error_reporter_.reset(new CertificateErrorReporter(
-        request_context_getter->GetURLRequestContext(), certificate_upload_url,
-        CertificateErrorReporter::SEND_COOKIES));
-  }
 
   version_ = SafeBrowsingProtocolManagerHelper::Version();
 }