Refactor CertificateReportSender

chrome/browser/safe_browsing/ping_manager.cc

 // Copyright (c) 2012 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/safe_browsing/ping_manager.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "components/certificate_reporting/error_reporter.h"
 #include "content/public/browser/browser_thread.h"
 #include "google_apis/google_api_keys.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/ssl/ssl_info.h"
-#include "net/url_request/certificate_report_sender.h"
+#include "net/url_request/report_sender.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 #include "url/gurl.h"
 
 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
@@ skipping 24 matching lines @@
       request_context_getter_(request_context_getter),
       url_prefix_(config.url_prefix) {
   DCHECK(!url_prefix_.empty());
 
   if (request_context_getter) {
     // Set the upload URL and whether or not to send cookies with
     // certificate reports sent to Safe Browsing servers.
     bool use_insecure_certificate_upload_url =
         certificate_reporting::ErrorReporter::IsHttpUploadUrlSupported();
 
-    net::CertificateReportSender::CookiesPreference cookies_preference;
+    net::ReportSender::CookiesPreference cookies_preference;
     GURL certificate_upload_url;
     if (use_insecure_certificate_upload_url) {
-      cookies_preference = net::CertificateReportSender::DO_NOT_SEND_COOKIES;
+      cookies_preference = net::ReportSender::DO_NOT_SEND_COOKIES;
       certificate_upload_url = GURL(kExtendedReportingUploadUrlInsecure);
     } else {
-      cookies_preference = net::CertificateReportSender::SEND_COOKIES;
+      cookies_preference = net::ReportSender::SEND_COOKIES;
       certificate_upload_url = GURL(kExtendedReportingUploadUrlSecure);
     }
 
     certificate_error_reporter_.reset(new certificate_reporting::ErrorReporter(
         request_context_getter->GetURLRequestContext(), certificate_upload_url,
         cookies_preference));
   }
 
   version_ = SafeBrowsingProtocolManagerHelper::Version();
 }
@@ skipping 150 matching lines @@
           version_.c_str());
   std::string api_key = google_apis::GetAPIKey();
   if (!api_key.empty()) {
     base::StringAppendF(&url, "&key=%s",
                         net::EscapeQueryParamValue(api_key, true).c_str());
   }
   return GURL(url);
 }
 
 }  // namespace safe_browsing