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 --- chromium/components/metrics/metrics_service.cc | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'chromium/components/metrics/metrics_service.cc') diff --git a/chromium/components/metrics/metrics_service.cc b/chromium/components/metrics/metrics_service.cc index 687471a854d..6e3e369a220 100644 --- a/chromium/components/metrics/metrics_service.cc +++ b/chromium/components/metrics/metrics_service.cc @@ -219,7 +219,9 @@ MetricsService::MetricsService(MetricsStateManager* state_manager, test_mode_active_(false), state_(INITIALIZED), idle_since_last_transmission_(false), - session_id_(-1) { + session_id_(-1), + synthetic_trial_registry_( + client->IsExternalExperimentAllowlistEnabled()) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK(state_manager_); DCHECK(client_); @@ -229,9 +231,6 @@ MetricsService::MetricsService(MetricsStateManager* state_manager, std::make_unique(local_state_)); RegisterMetricsProvider(state_manager_->GetProvider()); - - RegisterMetricsProvider(std::make_unique( - &synthetic_trial_registry_, base::StringPiece())); } MetricsService::~MetricsService() { @@ -239,6 +238,12 @@ MetricsService::~MetricsService() { } void MetricsService::InitializeMetricsRecordingState() { + // The FieldTrialsProvider should be registered last. This ensures that + // studies whose features are checked when providers add their information to + // the log appear in the active field trials. + RegisterMetricsProvider(std::make_unique( + &synthetic_trial_registry_, base::StringPiece())); + reporting_service_.Initialize(); InitializeMetricsState(); @@ -449,10 +454,6 @@ void MetricsService::ClearSavedStabilityMetrics() { delegating_provider_.ClearSavedStabilityMetrics(); } -void MetricsService::PushExternalLog(const std::string& log) { - log_store()->StoreLog(log, MetricsLog::ONGOING_LOG); -} - bool MetricsService::StageCurrentLogForTest() { CloseCurrentLog(); @@ -539,6 +540,7 @@ void MetricsService::InitializeMetricsState() { local_state_->SetInteger(prefs::kMetricsSessionID, session_id_); // Notify stability metrics providers about the launch. + UMA_HISTOGRAM_BOOLEAN("UMA.MetricsService.Initialize", true); provider.LogLaunch(); provider.CheckLastSessionEndCompleted(); -- cgit v1.2.1