| Index: components/metrics/metrics_service.cc
|
| diff --git a/components/metrics/metrics_service.cc b/components/metrics/metrics_service.cc
|
| index d17911a0bf9c259e20748f11b2b3720e8fb32a5b..913251fa55fd366c1c9146194dcb75f60bc96746 100644
|
| --- a/components/metrics/metrics_service.cc
|
| +++ b/components/metrics/metrics_service.cc
|
| @@ -149,6 +149,7 @@
|
| #include "base/tracked_objects.h"
|
| #include "base/values.h"
|
| #include "build/build_config.h"
|
| +#include "components/metrics/metrics_data_use_measurements.h"
|
| #include "components/metrics/metrics_log.h"
|
| #include "components/metrics/metrics_log_manager.h"
|
| #include "components/metrics/metrics_log_uploader.h"
|
| @@ -305,6 +306,7 @@ MetricsService::MetricsService(MetricsStateManager* state_manager,
|
| int64_t install_date = local_state_->GetInt64(prefs::kInstallDate);
|
| if (install_date == 0)
|
| local_state_->SetInt64(prefs::kInstallDate, base::Time::Now().ToTimeT());
|
| + MetricsDataUseMeasurements::Initialize(local_state_);
|
| }
|
|
|
| MetricsService::~MetricsService() {
|
| @@ -866,7 +868,11 @@ void MetricsService::SendNextLog() {
|
| }
|
| if (!log_manager_.has_staged_log())
|
| log_manager_.StageNextLogForUpload();
|
| - SendStagedLog();
|
| + if (MetricsDataUseMeasurements::GetInstance()->CanUploadUMALog(
|
| + log_manager_.staged_log_hash().size()))
|
| + SendStagedLog();
|
| + else
|
| + scheduler_->UploadCancelled();
|
| }
|
|
|
| bool MetricsService::ProvidersHaveInitialStabilityMetrics() {
|
|
|