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

chrome/browser/page_load_metrics/page_load_metrics_initialize.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 "chrome/browser/page_load_metrics/page_load_metrics_initialize.h"
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/page_load_metrics/metrics_web_contents_observer.h"
 #if defined(OS_ANDROID)
@@ skipping 40 matching lines @@
 
 PageLoadMetricsEmbedder::PageLoadMetricsEmbedder(
     content::WebContents* web_contents)
     : web_contents_(web_contents) {}
 
 PageLoadMetricsEmbedder::~PageLoadMetricsEmbedder() {}
 
 void PageLoadMetricsEmbedder::RegisterObservers(
     page_load_metrics::PageLoadTracker* tracker) {
   // These classes are owned by the metrics.
-  tracker->AddObserver(base::WrapUnique(new AbortsPageLoadMetricsObserver()));
-  tracker->AddObserver(base::WrapUnique(new CorePageLoadMetricsObserver()));
-  tracker->AddObserver(base::WrapUnique(
-      new data_reduction_proxy::DataReductionProxyMetricsObserver()));
-  tracker->AddObserver(base::WrapUnique(new FromGWSPageLoadMetricsObserver()));
+  tracker->AddObserver(base::MakeUnique<AbortsPageLoadMetricsObserver>());
+  tracker->AddObserver(base::MakeUnique<CorePageLoadMetricsObserver>());
   tracker->AddObserver(
-      base::WrapUnique(new google_captcha_observer::GoogleCaptchaObserver()));
+      base::MakeUnique<
+          data_reduction_proxy::DataReductionProxyMetricsObserver>());
+  tracker->AddObserver(base::MakeUnique<FromGWSPageLoadMetricsObserver>());
+  tracker->AddObserver(
+      base::MakeUnique<google_captcha_observer::GoogleCaptchaObserver>());
   // TODO(ricea): Remove this in April 2016 or before. crbug.com/348877
   tracker->AddObserver(
-      base::WrapUnique(new chrome::StaleWhileRevalidateMetricsObserver()));
+      base::MakeUnique<chrome::StaleWhileRevalidateMetricsObserver>());
   tracker->AddObserver(
-      base::WrapUnique(new DocumentWritePageLoadMetricsObserver()));
+      base::MakeUnique<DocumentWritePageLoadMetricsObserver>());
   tracker->AddObserver(
       base::WrapUnique(new previews::PreviewsPageLoadMetricsObserver()));
   tracker->AddObserver(
-      base::WrapUnique(new ServiceWorkerPageLoadMetricsObserver()));
-  tracker->AddObserver(
-      base::WrapUnique(new HttpsEngagementPageLoadMetricsObserver(
-          web_contents_->GetBrowserContext())));
+      base::MakeUnique<ServiceWorkerPageLoadMetricsObserver>());
+  tracker->AddObserver(base::MakeUnique<HttpsEngagementPageLoadMetricsObserver>(
+      web_contents_->GetBrowserContext()));
   tracker->AddObserver(base::WrapUnique(new CssScanningMetricsObserver()));
 #if defined(OS_ANDROID)
   tracker->AddObserver(
-      base::WrapUnique(new AndroidPageLoadMetricsObserver(web_contents_)));
+      base::MakeUnique<AndroidPageLoadMetricsObserver>(web_contents_));
 #endif  // OS_ANDROID
 }
 
 bool PageLoadMetricsEmbedder::IsPrerendering(
     content::WebContents* web_contents) {
   return prerender::PrerenderContents::FromWebContents(web_contents) != nullptr;
 }
 
 bool PageLoadMetricsEmbedder::IsNewTabPageUrl(const GURL& url) {
   Profile* profile =
       Profile::FromBrowserContext(web_contents_->GetBrowserContext());
   if (!profile)
     return false;
   return search::IsInstantNTPURL(url, profile);
 }
 
 }  // namespace
 
 void InitializePageLoadMetricsForWebContents(
     content::WebContents* web_contents) {
   page_load_metrics::MetricsWebContentsObserver::CreateForWebContents(
-      web_contents,
-      base::WrapUnique(new PageLoadMetricsEmbedder(web_contents)));
+      web_contents, base::MakeUnique<PageLoadMetricsEmbedder>(web_contents));
 }
 
 }  // namespace chrome