Use CertificateReportSender error callback to record HPKP UMA metrics

net/url_request/certificate_report_sender.h

Index: net/url_request/certificate_report_sender.h
diff --git a/net/url_request/certificate_report_sender.h b/net/url_request/certificate_report_sender.h
index f77d38e54cfc00f629178c7c5595f92a1ed92eaa..a5b686c048722a828d8cc164eaa7f2b226e53179 100644
--- a/net/url_request/certificate_report_sender.h
+++ b/net/url_request/certificate_report_sender.h
@@ -30,6 +30,8 @@ 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 };
 
@@ -44,17 +46,17 @@ class NET_EXPORT CertificateReportSender
   // 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;
@@ -69,7 +71,7 @@ class NET_EXPORT CertificateReportSender
   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);
 };