From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- .../components/metrics_services_manager/metrics_services_manager.cc | 2 +- .../metrics_services_manager/metrics_services_manager_client.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'chromium/components/metrics_services_manager') diff --git a/chromium/components/metrics_services_manager/metrics_services_manager.cc b/chromium/components/metrics_services_manager/metrics_services_manager.cc index f125deb811c..107632b0ad8 100644 --- a/chromium/components/metrics_services_manager/metrics_services_manager.cc +++ b/chromium/components/metrics_services_manager/metrics_services_manager.cc @@ -147,7 +147,7 @@ void MetricsServicesManager::UpdateUkmService() { bool sync_enabled = metrics_service_client_->IsMetricsReportingForceEnabled() || metrics_service_client_->IsUkmAllowedForAllProfiles(); - bool is_incognito = client_->IsIncognitoSessionActive(); + bool is_incognito = client_->IsOffTheRecordSessionActive(); if (consent_given_ && listeners_active && sync_enabled && !is_incognito) { // TODO(skare): revise this - merged in a big change diff --git a/chromium/components/metrics_services_manager/metrics_services_manager_client.h b/chromium/components/metrics_services_manager/metrics_services_manager_client.h index f8f1846b72d..43a52f60456 100644 --- a/chromium/components/metrics_services_manager/metrics_services_manager_client.h +++ b/chromium/components/metrics_services_manager/metrics_services_manager_client.h @@ -57,8 +57,8 @@ class MetricsServicesManagerClient { // Returns whether metrics consent is given. virtual bool IsMetricsConsentGiven() = 0; - // Returns whether there are any Incognito browsers/tabs open. - virtual bool IsIncognitoSessionActive() = 0; + // Returns whether there are any OffTheRecord browsers/tabs open. + virtual bool IsOffTheRecordSessionActive() = 0; // Update the running state of metrics services managed by the embedder, for // example, crash reporting. -- cgit v1.2.1