Refactor CertificateReportSender

chrome/browser/ssl/certificate_reporting_test_utils.cc

 // Copyright 2015 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/certificate_reporting_test_utils.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/macros.h"
 #include "base/metrics/field_trial.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/ping_manager.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/safe_browsing/ui_manager.h"
 #include "chrome/browser/ssl/cert_report_helper.h"
 #include "chrome/browser/ssl/ssl_cert_reporter.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/pref_names.h"
 #include "components/certificate_reporting/error_report.h"
 #include "components/certificate_reporting/error_reporter.h"
 #include "components/prefs/pref_service.h"
 #include "components/variations/variations_associated_data.h"
-#include "net/url_request/certificate_report_sender.h"
+#include "net/url_request/report_sender.h"
 #include "net/url_request/url_request_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 using safe_browsing::SafeBrowsingService;
 using safe_browsing::SafeBrowsingUIManager;
 
 namespace {
 
 void SetMockReporter(
@@ skipping 42 matching lines @@
 
 namespace certificate_reporting_test_utils {
 
 // This class is used to test invalid certificate chain reporting when
 // the user opts in to do so on the interstitial. It keeps track of the
 // most recent hostname for which an extended reporting report would
 // have been sent over the network.
 class CertificateReportingTest::MockReporter
     : public certificate_reporting::ErrorReporter {
  public:
-  MockReporter(
-      net::URLRequestContext* request_context,
-      const GURL& upload_url,
-      net::CertificateReportSender::CookiesPreference cookies_preference);
+  MockReporter(net::URLRequestContext* request_context,
+               const GURL& upload_url,
+               net::ReportSender::CookiesPreference cookies_preference);
 
   // ErrorReporter implementation.
   void SendExtendedReportingReport(
       const std::string& serialized_report) override;
 
   // Returns the hostname in the report for the last call to
   // |SendReport|.
   const std::string& latest_hostname_reported() {
     return latest_hostname_reported_;
   }
 
  private:
   std::string latest_hostname_reported_;
 
   DISALLOW_COPY_AND_ASSIGN(MockReporter);
 };
 
 CertificateReportingTest::MockReporter::MockReporter(
     net::URLRequestContext* request_context,
     const GURL& upload_url,
-    net::CertificateReportSender::CookiesPreference cookies_preference)
+    net::ReportSender::CookiesPreference cookies_preference)
     : certificate_reporting::ErrorReporter(request_context,
                                            upload_url,
                                            cookies_preference) {}
 
 void CertificateReportingTest::MockReporter::SendExtendedReportingReport(
     const std::string& serialized_report) {
   certificate_reporting::ErrorReport report;
   ASSERT_TRUE(report.InitializeFromString(serialized_report));
   latest_hostname_reported_ = report.hostname();
 }
 
 void CertificateReportingTest::SetUpMockReporter() {
   // Set up the mock reporter to track the hostnames that reports get
   // sent for. The request_context argument is null here
   // because the MockReporter doesn't actually use a
   // request_context. (In order to pass a real request_context, the
   // reporter would have to be constructed on the IO thread.)
   reporter_ = new CertificateReportingTest::MockReporter(
       nullptr, GURL("http://example.test"),
-      net::CertificateReportSender::DO_NOT_SEND_COOKIES);
+      net::ReportSender::DO_NOT_SEND_COOKIES);
 
   scoped_refptr<SafeBrowsingService> safe_browsing_service =
       g_browser_process->safe_browsing_service();
   ASSERT_TRUE(safe_browsing_service);
 
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(
           SetMockReporter, base::RetainedRef(safe_browsing_service),
           base::Passed(std::unique_ptr<certificate_reporting::ErrorReporter>(
@@ skipping 41 matching lines @@
     if (!base::StringToDouble(param, &sendingThreshold))
       return CERT_REPORT_NOT_EXPECTED;
 
     if (sendingThreshold == 1.0)
       return certificate_reporting_test_utils::CERT_REPORT_EXPECTED;
   }
   return certificate_reporting_test_utils::CERT_REPORT_NOT_EXPECTED;
 }
 
 }  // namespace certificate_reporting_test_utils