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

chrome/browser/safe_browsing/incident_reporting/download_metadata_manager.cc

 // Copyright 2014 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/incident_reporting/download_metadata_manager.h"
 
 #include <limits.h>
 #include <stdint.h>
 
 #include <list>
@@ skipping 363 matching lines @@
       new ManagerContext(read_runner_, write_runner_, download_manager);
 }
 
 void DownloadMetadataManager::SetRequest(content::DownloadItem* item,
                                          const ClientDownloadRequest* request) {
   DCHECK(request);
   content::DownloadManager* download_manager =
       GetDownloadManagerForBrowserContext(item->GetBrowserContext());
   DCHECK_EQ(contexts_.count(download_manager), 1U);
   contexts_[download_manager]->SetRequest(
-      item, base::WrapUnique(new ClientDownloadRequest(*request)));
+      item, base::MakeUnique<ClientDownloadRequest>(*request));
 }
 
 void DownloadMetadataManager::GetDownloadDetails(
     content::BrowserContext* browser_context,
     const GetDownloadDetailsCallback& callback) {
   DCHECK(browser_context);
   // The DownloadManager for |browser_context| may not have been created yet. In
   // this case, asking for it would cause history to load in the background and
   // wouldn't really help much. Instead, scan the contexts to see if one belongs
   // to |browser_context|. If one is not found, read the metadata and return it.
@@ skipping 91 matching lines @@
     DownloadItemData::SetRequestForDownload(download, std::move(request));
   else
     CommitRequest(download, std::move(request));
 }
 
 void DownloadMetadataManager::ManagerContext::GetDownloadDetails(
     const GetDownloadDetailsCallback& callback) {
   if (state_ != LOAD_COMPLETE) {
     get_details_callbacks_.push_back(callback);
   } else {
-    callback.Run(
-        download_metadata_
-            ? base::WrapUnique(new ClientIncidentReport_DownloadDetails(
-                  download_metadata_->download()))
-            : nullptr);
+    callback.Run(download_metadata_
+                     ? base::MakeUnique<ClientIncidentReport_DownloadDetails>(
+                           download_metadata_->download())
+                     : nullptr);
   }
 }
 
 void DownloadMetadataManager::ManagerContext::OnDownloadUpdated(
     content::DownloadItem* download) {
   // Persist metadata for this download if it has just completed.
   if (download->GetState() == content::DownloadItem::COMPLETE) {
     // Ignore downloads we don't have a ClientDownloadRequest for.
     std::unique_ptr<ClientDownloadRequest> request =
         DownloadItemData::TakeRequestForDownload(download);
@@ skipping 86 matching lines @@
   RunCallbacks();
 }
 
 void DownloadMetadataManager::ManagerContext::ClearPendingItems() {
   pending_items_.clear();
 }
 
 void DownloadMetadataManager::ManagerContext::RunCallbacks() {
   while (!get_details_callbacks_.empty()) {
     const auto& callback = get_details_callbacks_.front();
-    callback.Run(
-        download_metadata_
-            ? base::WrapUnique(new ClientIncidentReport_DownloadDetails(
-                  download_metadata_->download()))
-            : nullptr);
+    callback.Run(download_metadata_
+                     ? base::MakeUnique<ClientIncidentReport_DownloadDetails>(
+                           download_metadata_->download())
+                     : nullptr);
     get_details_callbacks_.pop_front();
   }
 }
 
 bool DownloadMetadataManager::ManagerContext::HasMetadataFor(
     const content::DownloadItem* item) const {
   // There must not be metadata if the load is not complete.
   DCHECK(state_ == LOAD_COMPLETE || !download_metadata_);
   return (download_metadata_ &&
           download_metadata_->download_id() == item->GetId());
@@ skipping 36 matching lines @@
 }
 
 void DownloadMetadataManager::ManagerContext::UpdateLastOpenedTime(
     const base::Time& last_opened_time) {
   download_metadata_->mutable_download()->set_open_time_msec(
       last_opened_time.ToJavaTime());
   WriteMetadata();
 }
 
 }  // namespace safe_browsing