Re-write many calls to WrapUnique() with MakeUnique()

components/certificate_reporting/error_reporter.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 "components/certificate_reporting/error_reporter.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <utility>
@@ skipping 94 matching lines @@
 void RecordUMAOnFailure(const GURL& report_uri, int net_error) {
   UMA_HISTOGRAM_SPARSE_SLOWLY("SSL.CertificateErrorReportFailure", -net_error);
 }
 
 }  // namespace
 
 ErrorReporter::ErrorReporter(
     net::URLRequestContext* request_context,
     const GURL& upload_url,
     net::ReportSender::CookiesPreference cookies_preference)
-    : ErrorReporter(upload_url,
-                    kServerPublicKey,
-                    kServerPublicKeyVersion,
-                    base::WrapUnique(new net::ReportSender(
-                        request_context,
-                        cookies_preference,
-                        base::Bind(RecordUMAOnFailure)))) {}
+    : ErrorReporter(
+          upload_url,
+          kServerPublicKey,
+          kServerPublicKeyVersion,
+          base::MakeUnique<net::ReportSender>(request_context,
+                                              cookies_preference,
+                                              base::Bind(RecordUMAOnFailure))) {
+}
 
 ErrorReporter::ErrorReporter(
     const GURL& upload_url,
     const uint8_t server_public_key[/* 32 */],
     const uint32_t server_public_key_version,
     std::unique_ptr<net::ReportSender> certificate_report_sender)
     : certificate_report_sender_(std::move(certificate_report_sender)),
       upload_url_(upload_url),
       server_public_key_(server_public_key),
       server_public_key_version_(server_public_key_version) {
@@ skipping 37 matching lines @@
   aead.Init(&key);
 
   // Use an all-zero nonce because the key is random per-message.
   std::string nonce(aead.NonceLength(), 0);
 
   return aead.Open(encrypted_report.encrypted_report(), nonce, std::string(),
                    decrypted_serialized_report);
 }
 
 }  // namespace certificate_reporting