Use CertificateReportSender error callback to record HPKP UMA metrics

net/url_request/certificate_report_sender.h

 // 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.
 
 #ifndef NET_URL_REQUEST_CERTIFICATE_REPORT_SENDER_H_
 #define NET_URL_REQUEST_CERTIFICATE_REPORT_SENDER_H_
 
 #include <set>
 #include <string>
 
@@ skipping 12 matching lines @@
 // CertificateReportSender asynchronously sends serialized certificate
 // reports to a URI. It takes serialized reports as a sequence of bytes
 // so as to be agnostic to the format of the report being sent (JSON,
 // protobuf, etc.) and the particular data that it contains. Multiple
 // reports can be in-flight at once. This class owns inflight requests
 // and cleans them up when necessary.
 class NET_EXPORT CertificateReportSender
     : public URLRequest::Delegate,
       public TransportSecurityState::ReportSender {
  public:
+  using ErrorCallback = base::Callback<void(const GURL&, int)>;
+
   // Represents whether or not to send cookies along with reports.
   enum CookiesPreference { SEND_COOKIES, DO_NOT_SEND_COOKIES };
 
   // Constructs a CertificateReportSender that sends reports with the
   // given |request_context| and includes or excludes cookies based on
   // |cookies_preference|. |request_context| must outlive the
   // CertificateReportSender.
   CertificateReportSender(URLRequestContext* request_context,
                           CookiesPreference cookies_preference);
 
   // Constructs a CertificateReportSender that sends reports with the
   // given |request_context| and includes or excludes cookies based on
   // |cookies_preference|. |request_context| must outlive the
   // CertificateReportSender. When sending a report results in an error,
-  // |error_callback| is called with a pointer to the URLRequest as an
-  // argument.
-  CertificateReportSender(
-      URLRequestContext* request_context,
-      CookiesPreference cookies_preference,
-      const base::Callback<void(URLRequest*)>& error_callback);
+  // |error_callback| is called with the report URI and net error as
+  // arguments.
+  CertificateReportSender(URLRequestContext* request_context,
+                          CookiesPreference cookies_preference,
+                          const ErrorCallback& error_callback);
 
   ~CertificateReportSender() override;
 
   // TransportSecurityState::ReportSender implementation.
   void Send(const GURL& report_uri, const std::string& report) override;
+  void SetErrorCallback(const ErrorCallback& error_callback) override;
 
   // net::URLRequest::Delegate implementation.
   void OnResponseStarted(URLRequest* request) override;
   void OnReadCompleted(URLRequest* request, int bytes_read) override;
 
  private:
   net::URLRequestContext* const request_context_;
 
   CookiesPreference cookies_preference_;
 
   // Owns the contained requests.
   std::set<URLRequest*> inflight_requests_;
 
   // Called when a sent report results in an error.
-  base::Callback<void(URLRequest* request)> error_callback_;
+  ErrorCallback error_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(CertificateReportSender);
 };
 
 }  // namespace net
 
 #endif  // NET_URL_REQUEST_CERTIFICATE_REPORT_H_