| Index: components/metrics_services_manager/metrics_services_manager.cc
|
| diff --git a/components/metrics_services_manager/metrics_services_manager.cc b/components/metrics_services_manager/metrics_services_manager.cc
|
| index 5987635fbacfbf3d479b89ff07eeb33c4e116827..15bfccec89c44272204825cc6296b207a9298571 100644
|
| --- a/components/metrics_services_manager/metrics_services_manager.cc
|
| +++ b/components/metrics_services_manager/metrics_services_manager.cc
|
| @@ -132,6 +132,7 @@ void MetricsServicesManager::UpdateUkmService() {
|
| if (!ukm)
|
| return;
|
| bool sync_enabled =
|
| + client_->IsMetricsReportingForceEnabled() ||
|
| metrics_service_client_->IsHistorySyncEnabledOnAllProfiles();
|
| if (may_record_ && sync_enabled) {
|
| ukm->EnableRecording();
|
| @@ -146,7 +147,9 @@ void MetricsServicesManager::UpdateUkmService() {
|
| }
|
|
|
| void MetricsServicesManager::UpdateUploadPermissions(bool may_upload) {
|
| - UpdatePermissions(client_->IsMetricsReportingEnabled(), may_upload);
|
| + UpdatePermissions((client_->IsMetricsReportingForceEnabled() ||
|
| + client_->IsMetricsReportingEnabled()),
|
| + client_->IsMetricsReportingForceEnabled() || may_upload);
|
| }
|
|
|
| } // namespace metrics_services_manager
|
|
|