Convert //chrome/browser/metrics from scoped_ptr to std::unique_ptr

chrome/browser/metrics/chrome_metrics_services_manager_client.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/metrics/chrome_metrics_services_manager_client.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "base/memory/ptr_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "chrome/browser/metrics/chrome_metrics_service_client.h"
 #include "chrome/browser/metrics/variations/chrome_variations_service_client.h"
 #include "chrome/browser/metrics/variations/ui_string_overrider_factory.h"
 #include "chrome/browser/ui/browser_otr_state.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "components/metrics/metrics_state_manager.h"
 #include "components/prefs/pref_service.h"
@@ skipping 16 matching lines @@
 ChromeMetricsServicesManagerClient::ChromeMetricsServicesManagerClient(
     PrefService* local_state)
     : local_state_(local_state) {
   DCHECK(local_state);
 
   SetupMetricsStateForChromeOS();
 }
 
 ChromeMetricsServicesManagerClient::~ChromeMetricsServicesManagerClient() {}
 
-scoped_ptr<rappor::RapporService>
+std::unique_ptr<rappor::RapporService>
 ChromeMetricsServicesManagerClient::CreateRapporService() {
   DCHECK(thread_checker_.CalledOnValidThread());
-  return make_scoped_ptr(new rappor::RapporService(
+  return base::WrapUnique(new rappor::RapporService(
       local_state_, base::Bind(&chrome::IsOffTheRecordSessionActive)));
 }
 
-scoped_ptr<variations::VariationsService>
+std::unique_ptr<variations::VariationsService>
 ChromeMetricsServicesManagerClient::CreateVariationsService() {
   DCHECK(thread_checker_.CalledOnValidThread());
   return variations::VariationsService::Create(
-      make_scoped_ptr(new ChromeVariationsServiceClient()), local_state_,
+      base::WrapUnique(new ChromeVariationsServiceClient()), local_state_,
       GetMetricsStateManager(), switches::kDisableBackgroundNetworking,
       chrome_variations::CreateUIStringOverrider());
 }
 
-scoped_ptr<metrics::MetricsServiceClient>
+std::unique_ptr<metrics::MetricsServiceClient>
 ChromeMetricsServicesManagerClient::CreateMetricsServiceClient() {
   DCHECK(thread_checker_.CalledOnValidThread());
   return ChromeMetricsServiceClient::Create(GetMetricsStateManager(),
                                             local_state_);
 }
 
 net::URLRequestContextGetter*
 ChromeMetricsServicesManagerClient::GetURLRequestContext() {
   return g_browser_process->system_request_context();
 }
@@ skipping 33 matching lines @@
   if (!metrics_state_manager_) {
     metrics_state_manager_ = metrics::MetricsStateManager::Create(
         local_state_,
         base::Bind(
             &ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled),
         base::Bind(&PostStoreMetricsClientInfo),
         base::Bind(&GoogleUpdateSettings::LoadMetricsClientInfo));
   }
   return metrics_state_manager_.get();
 }