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/metrics_service_client.cc | 29 +++++++++++++--------- 1 file changed, 17 insertions(+), 12 deletions(-) (limited to 'chromium/components/metrics/metrics_service_client.cc') diff --git a/chromium/components/metrics/metrics_service_client.cc b/chromium/components/metrics/metrics_service_client.cc index 7e01ca6a3b6..c838a0c3a18 100644 --- a/chromium/components/metrics/metrics_service_client.cc +++ b/chromium/components/metrics/metrics_service_client.cc @@ -8,6 +8,7 @@ #include #include "base/command_line.h" +#include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "components/metrics/metrics_switches.h" @@ -30,18 +31,6 @@ ukm::UkmService* MetricsServiceClient::GetUkmService() { return nullptr; } -bool MetricsServiceClient::IsReportingPolicyManaged() { - return false; -} - -EnableMetricsDefault MetricsServiceClient::GetMetricsReportingDefaultState() { - return EnableMetricsDefault::DEFAULT_UNKNOWN; -} - -bool MetricsServiceClient::IsUMACellularUploadLogicEnabled() { - return false; -} - GURL MetricsServiceClient::GetMetricsServerUrl() { return GURL(kNewMetricsServerUrl); } @@ -73,6 +62,22 @@ bool MetricsServiceClient::ShouldStartUpFastForTesting() const { return false; } +bool MetricsServiceClient::IsReportingPolicyManaged() { + return false; +} + +EnableMetricsDefault MetricsServiceClient::GetMetricsReportingDefaultState() { + return EnableMetricsDefault::DEFAULT_UNKNOWN; +} + +bool MetricsServiceClient::IsUMACellularUploadLogicEnabled() { + return false; +} + +bool MetricsServiceClient::IsExternalExperimentAllowlistEnabled() { + return true; +} + bool MetricsServiceClient::IsUkmAllowedForAllProfiles() { return false; } -- cgit v1.2.1