Refactor CertificateReportSender

chrome/browser/ssl/chrome_expect_ct_reporter_unittest.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_reader.h"
 #include "base/run_loop.h"
 #include "base/test/histogram_tester.h"
 #include "base/values.h"
 #include "chrome/common/chrome_features.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "net/base/test_data_directory.h"
 #include "net/ssl/signed_certificate_timestamp_and_status.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/url_request/url_request_failed_job.h"
-#include "net/url_request/certificate_report_sender.h"
+#include "net/url_request/report_sender.h"
 #include "net/url_request/url_request_filter.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 namespace {
 
 const char kSendHistogramName[] = "SSL.ExpectCTReportSendingAttempt";
 const char kFailureHistogramName[] = "SSL.ExpectCTReportFailure";
 
-// A test CertificateReportSender that exposes the latest report URI and
+// A test ReportSender that exposes the latest report URI and
 // serialized report to be sent.
-class TestCertificateReportSender : public net::CertificateReportSender {
+class TestCertificateReportSender : public net::ReportSender {
  public:
   TestCertificateReportSender()
-      : CertificateReportSender(
-            nullptr,
-            net::CertificateReportSender::DO_NOT_SEND_COOKIES) {}
+      : ReportSender(nullptr, net::ReportSender::DO_NOT_SEND_COOKIES) {}
   ~TestCertificateReportSender() override {}
 
   void Send(const GURL& report_uri,
             const std::string& serialized_report) override {
     latest_report_uri_ = report_uri;
     latest_serialized_report_ = serialized_report;
   }
 
   const GURL& latest_report_uri() { return latest_report_uri_; }
 
@@ skipping 414 matching lines @@
   reporter.OnExpectCTFailed(host_port, report_uri, ssl_info);
   EXPECT_EQ(report_uri, sender->latest_report_uri());
   EXPECT_FALSE(sender->latest_serialized_report().empty());
   ASSERT_NO_FATAL_FAILURE(CheckExpectCTReport(
       sender->latest_serialized_report(), host_port, ssl_info));
 
   histograms.ExpectTotalCount(kFailureHistogramName, 0);
   histograms.ExpectTotalCount(kSendHistogramName, 1);
   histograms.ExpectBucketCount(kSendHistogramName, true, 1);
 }