Revert of Use ChromeBrowserStateManager instead of BrowserListIOS.

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/tabs/tab_model_list.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 121 matching lines @@
   // Register metrics providers.
   metrics_service_->RegisterMetricsProvider(
       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(
       base::MakeUnique<OmniboxMetricsProvider>(
-          base::Bind(&::IsOffTheRecordSessionActive)));
+          base::Bind(&BrowserListIOS::IsOffTheRecordSessionActive)));
 
   {
     auto stability_metrics_provider =
         base::MakeUnique<IOSChromeStabilityMetricsProvider>(
             GetApplicationContext()->GetLocalState());
     stability_metrics_provider_ = stability_metrics_provider.get();
     metrics_service_->RegisterMetricsProvider(
         std::move(stability_metrics_provider));
   }
 
@@ skipping 108 matching lines @@
 
 void IOSChromeMetricsServiceClient::OnURLOpenedFromOmnibox(OmniboxLog* log) {
   metrics_service_->OnApplicationNotIdle();
 }
 
 metrics::EnableMetricsDefault
 IOSChromeMetricsServiceClient::GetMetricsReportingDefaultState() {
   return metrics::GetMetricsReportingDefaultState(
       GetApplicationContext()->GetLocalState());
 }