Refactor CertificateReportSender

chrome/browser/ssl/chrome_expect_ct_reporter.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ssl/chrome_expect_ct_reporter.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/json/json_writer.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/common/chrome_features.h"
-#include "net/url_request/certificate_report_sender.h"
+#include "net/url_request/report_sender.h"
 
 namespace {
 
 std::string TimeToISO8601(const base::Time& t) {
   base::Time::Exploded exploded;
   t.UTCExplode(&exploded);
   return base::StringPrintf(
       "%04d-%02d-%02dT%02d:%02d:%02d.%03dZ", exploded.year, exploded.month,
       exploded.day_of_month, exploded.hour, exploded.minute, exploded.second,
       exploded.millisecond);
@@ skipping 76 matching lines @@
 // Records an UMA histogram of the net errors when Expect CT reports
 // fails to send.
 void RecordUMAOnFailure(const GURL& report_uri, int net_error) {
   UMA_HISTOGRAM_SPARSE_SLOWLY("SSL.ExpectCTReportFailure", net_error);
 }
 
 }  // namespace
 
 ChromeExpectCTReporter::ChromeExpectCTReporter(
     net::URLRequestContext* request_context)
-    : report_sender_(new net::CertificateReportSender(
-          request_context,
-          net::CertificateReportSender::DO_NOT_SEND_COOKIES,
-          base::Bind(RecordUMAOnFailure))) {}
+    : report_sender_(
+          new net::ReportSender(request_context,
+                                net::ReportSender::DO_NOT_SEND_COOKIES,
+                                base::Bind(RecordUMAOnFailure))) {}
 
 ChromeExpectCTReporter::~ChromeExpectCTReporter() {}
 
 void ChromeExpectCTReporter::OnExpectCTFailed(
     const net::HostPortPair& host_port_pair,
     const GURL& report_uri,
     const net::SSLInfo& ssl_info) {
   if (report_uri.is_empty())
     return;
 
@@ skipping 39 matching lines @@
   std::string serialized_report;
   if (!base::JSONWriter::Write(report, &serialized_report)) {
     LOG(ERROR) << "Failed to serialize Expect CT report";
     return;
   }
 
   UMA_HISTOGRAM_BOOLEAN("SSL.ExpectCTReportSendingAttempt", true);
 
   report_sender_->Send(report_uri, serialized_report);
 }