| Index: chrome/browser/page_load_metrics/page_load_metrics_initialize.cc
|
| diff --git a/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc b/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc
|
| index cc17f4cdae4259661366f0f9ab07da09d45da979..c3e7e690faac8c469a5c86cde4d0aef2d9ba43d9 100644
|
| --- a/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc
|
| +++ b/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc
|
| @@ -58,29 +58,29 @@ 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
|
| }
|
|
|
| @@ -102,8 +102,7 @@ bool PageLoadMetricsEmbedder::IsNewTabPageUrl(const GURL& url) {
|
| 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
|
|
|