Remove ChromeBrowserProvider::IsOffTheRecordSessionActive().

ios/chrome/browser/metrics/ios_chrome_metrics_service_client.mm

 // 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 "ios/chrome/browser/metrics/ios_chrome_metrics_service_client.h"
 
 #include <stdint.h>
 
 #include <utility>
 #include <vector>
@@ skipping 33 matching lines @@
 #include "components/variations/variations_associated_data.h"
 #include "components/version_info/version_info.h"
 #include "ios/chrome/browser/application_context.h"
 #include "ios/chrome/browser/chrome_paths.h"
 #include "ios/chrome/browser/google/google_brand.h"
 #include "ios/chrome/browser/metrics/ios_chrome_stability_metrics_provider.h"
 #include "ios/chrome/browser/metrics/mobile_session_shutdown_metrics_provider.h"
 #include "ios/chrome/browser/signin/ios_chrome_signin_status_metrics_provider_delegate.h"
 #include "ios/chrome/browser/sync/ios_chrome_sync_client.h"
 #include "ios/chrome/browser/tab_parenting_global_observer.h"
-#include "ios/chrome/browser/ui/browser_otr_state.h"
+#include "ios/chrome/browser/ui/browser_list_ios.h"
 #include "ios/chrome/common/channel_info.h"
 #include "ios/web/public/web_thread.h"
 
 IOSChromeMetricsServiceClient::IOSChromeMetricsServiceClient(
     metrics::MetricsStateManager* state_manager)
     : metrics_state_manager_(state_manager),
       stability_metrics_provider_(nullptr),
       profiler_metrics_provider_(nullptr),
       drive_metrics_provider_(nullptr),
       start_time_(base::TimeTicks::Now()),
@@ skipping 80 matching lines @@
     metrics::TrackingSynchronizer::FetchProfilerDataAsynchronously(
         weak_ptr_factory_.GetWeakPtr());
   } else {
     CollectFinalHistograms();
   }
 }
 
 std::unique_ptr<metrics::MetricsLogUploader>
 IOSChromeMetricsServiceClient::CreateUploader(
     const base::Callback<void(int)>& on_upload_complete) {
-  return std::unique_ptr<metrics::MetricsLogUploader>(
-      new metrics::NetMetricsLogUploader(
-          GetApplicationContext()->GetSystemURLRequestContext(),
-          metrics::kDefaultMetricsServerUrl, metrics::kDefaultMetricsMimeType,
-          on_upload_complete));
+  return base::MakeUnique<metrics::NetMetricsLogUploader>(
+      GetApplicationContext()->GetSystemURLRequestContext(),
+      metrics::kDefaultMetricsServerUrl, metrics::kDefaultMetricsMimeType,
+      on_upload_complete);
 }
 
 base::TimeDelta IOSChromeMetricsServiceClient::GetStandardUploadInterval() {
   return metrics::GetUploadInterval();
 }
 
 base::string16 IOSChromeMetricsServiceClient::GetRegistryBackupKey() {
   return base::string16();
 }
 
 void IOSChromeMetricsServiceClient::OnRendererProcessCrash() {
   stability_metrics_provider_->LogRendererCrash();
 }
 
 void IOSChromeMetricsServiceClient::WebStateDidStartLoading(
     web::WebState* web_state) {
   metrics_service_->OnApplicationNotIdle();
 }
 
 void IOSChromeMetricsServiceClient::WebStateDidStopLoading(
     web::WebState* web_state) {
   metrics_service_->OnApplicationNotIdle();
 }
 
 void IOSChromeMetricsServiceClient::Initialize() {
-  metrics_service_.reset(new metrics::MetricsService(
-      metrics_state_manager_, this, GetApplicationContext()->GetLocalState()));
+  metrics_service_ = base::MakeUnique<metrics::MetricsService>(
+      metrics_state_manager_, this, GetApplicationContext()->GetLocalState());
 
   // Register metrics providers.
   metrics_service_->RegisterMetricsProvider(
-      std::unique_ptr<metrics::MetricsProvider>(
-          new metrics::NetworkMetricsProvider(
-              web::WebThread::GetBlockingPool())));
+      base::MakeUnique<metrics::NetworkMetricsProvider>(
+          web::WebThread::GetBlockingPool()));
 
   // Currently, we configure OmniboxMetricsProvider to not log events to UMA
   // if there is a single incognito session visible. In the future, it may
   // be worth revisiting this to still log events from non-incognito sessions.
   metrics_service_->RegisterMetricsProvider(
-      std::unique_ptr<metrics::MetricsProvider>(new OmniboxMetricsProvider(
-          base::Bind(&::IsOffTheRecordSessionActive))));
+      base::MakeUnique<OmniboxMetricsProvider>(
+          base::Bind(&BrowserListIOS::IsOffTheRecordSessionActive)));
 
-  stability_metrics_provider_ = new IOSChromeStabilityMetricsProvider(
-      GetApplicationContext()->GetLocalState());
-  metrics_service_->RegisterMetricsProvider(
-      std::unique_ptr<metrics::MetricsProvider>(stability_metrics_provider_));
+  {
+    auto stability_metrics_provider =
+        base::MakeUnique<IOSChromeStabilityMetricsProvider>(
+            GetApplicationContext()->GetLocalState());
+    stability_metrics_provider_ = stability_metrics_provider.get();
+    metrics_service_->RegisterMetricsProvider(
+        std::move(stability_metrics_provider));
+  }
 
   metrics_service_->RegisterMetricsProvider(
-      std::unique_ptr<metrics::MetricsProvider>(
-          new metrics::ScreenInfoMetricsProvider));
+      base::MakeUnique<metrics::ScreenInfoMetricsProvider>());
 
-  drive_metrics_provider_ = new metrics::DriveMetricsProvider(
-      web::WebThread::GetTaskRunnerForThread(web::WebThread::FILE),
-      ios::FILE_LOCAL_STATE);
-  metrics_service_->RegisterMetricsProvider(
-      std::unique_ptr<metrics::MetricsProvider>(drive_metrics_provider_));
+  {
+    auto drive_metrics_provider =
+        base::MakeUnique<metrics::DriveMetricsProvider>(
+            web::WebThread::GetTaskRunnerForThread(web::WebThread::FILE),
+            ios::FILE_LOCAL_STATE);
+    drive_metrics_provider_ = drive_metrics_provider.get();
+    metrics_service_->RegisterMetricsProvider(
+        std::move(drive_metrics_provider));
+  }
 
-  profiler_metrics_provider_ = new metrics::ProfilerMetricsProvider(
-      base::Bind(&metrics::IsCellularLogicEnabled));
-  metrics_service_->RegisterMetricsProvider(
-      std::unique_ptr<metrics::MetricsProvider>(profiler_metrics_provider_));
+  {
+    auto profiler_metrics_provider =
+        base::MakeUnique<metrics::ProfilerMetricsProvider>(
+            base::Bind(&metrics::IsCellularLogicEnabled));
+    profiler_metrics_provider_ = profiler_metrics_provider.get();
+    metrics_service_->RegisterMetricsProvider(
+        std::move(profiler_metrics_provider));
+  }
 
   metrics_service_->RegisterMetricsProvider(
-      std::unique_ptr<metrics::MetricsProvider>(
-          new metrics::CallStackProfileMetricsProvider));
+      base::MakeUnique<metrics::CallStackProfileMetricsProvider>());
 
   metrics_service_->RegisterMetricsProvider(
-      std::unique_ptr<metrics::MetricsProvider>(
-          SigninStatusMetricsProvider::CreateInstance(base::WrapUnique(
-              new IOSChromeSigninStatusMetricsProviderDelegate))));
+      base::WrapUnique(SigninStatusMetricsProvider::CreateInstance(
+          base::MakeUnique<IOSChromeSigninStatusMetricsProviderDelegate>())));
 
   metrics_service_->RegisterMetricsProvider(
-      std::unique_ptr<metrics::MetricsProvider>(
-          new MobileSessionShutdownMetricsProvider(metrics_service_.get())));
+      base::MakeUnique<MobileSessionShutdownMetricsProvider>(
+          metrics_service_.get()));
 
   metrics_service_->RegisterMetricsProvider(
-      std::unique_ptr<metrics::MetricsProvider>(
-          new syncer::DeviceCountMetricsProvider(
-              base::Bind(&IOSChromeSyncClient::GetDeviceInfoTrackers))));
+      base::MakeUnique<syncer::DeviceCountMetricsProvider>(
+          base::Bind(&IOSChromeSyncClient::GetDeviceInfoTrackers)));
 
   metrics_service_->RegisterMetricsProvider(
-      std::unique_ptr<metrics::MetricsProvider>(
-          new translate::TranslateRankerMetricsProvider()));
+      base::MakeUnique<translate::TranslateRankerMetricsProvider>());
 }
 
 void IOSChromeMetricsServiceClient::OnInitTaskGotDriveMetrics() {
   finished_init_task_callback_.Run();
 }
 
 bool IOSChromeMetricsServiceClient::ShouldIncludeProfilerDataInLog() {
   // Upload profiler data at most once per session.
   if (has_uploaded_profiler_data_)
     return false;
@@ skipping 59 matching lines @@
 
 void IOSChromeMetricsServiceClient::OnURLOpenedFromOmnibox(OmniboxLog* log) {
   metrics_service_->OnApplicationNotIdle();
 }
 
 metrics::EnableMetricsDefault
 IOSChromeMetricsServiceClient::GetMetricsReportingDefaultState() {
   return metrics::GetMetricsReportingDefaultState(
       GetApplicationContext()->GetLocalState());
 }