Index: components/metrics/metrics_service.cc |
diff --git a/components/metrics/metrics_service.cc b/components/metrics/metrics_service.cc |
index c3ef7ec71d8dd9b69774d8c46a4a1ebb4196c61a..d6b933a0a28e827e8d3cbff001c57a6bc9df7ce2 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/data_use_tracker.h" |
#include "components/metrics/metrics_log.h" |
#include "components/metrics/metrics_log_manager.h" |
#include "components/metrics/metrics_log_uploader.h" |
@@ -258,6 +259,7 @@ void MetricsService::RegisterPrefs(PrefRegistrySimple* registry) { |
DCHECK(IsSingleThreaded()); |
MetricsStateManager::RegisterPrefs(registry); |
MetricsLog::RegisterPrefs(registry); |
+ DataUseTracker::RegisterPrefs(registry); |
registry->RegisterInt64Pref(prefs::kInstallDate, 0); |
@@ -294,6 +296,7 @@ MetricsService::MetricsService(MetricsStateManager* state_manager, |
log_upload_in_progress_(false), |
idle_since_last_transmission_(false), |
session_id_(-1), |
+ data_use_tracker_(DataUseTracker::Create(local_state_)), |
self_ptr_factory_(this), |
state_saver_factory_(this) { |
DCHECK(IsSingleThreaded()); |
@@ -545,6 +548,16 @@ void MetricsService::PushExternalLog(const std::string& log) { |
log_manager_.StoreLog(log, MetricsLog::ONGOING_LOG); |
} |
+UpdateUsagePrefCallbackType MetricsService::GetDataUseForwardingCallback() { |
+ DCHECK(IsSingleThreaded()); |
+ |
+ if (data_use_tracker_) { |
+ return data_use_tracker_->GetDataUseForwardingCallback( |
+ base::ThreadTaskRunnerHandle::Get()); |
+ } |
+ return UpdateUsagePrefCallbackType(); |
+} |
+ |
//------------------------------------------------------------------------------ |
// private methods |
//------------------------------------------------------------------------------ |
@@ -866,7 +879,16 @@ void MetricsService::SendNextLog() { |
} |
if (!log_manager_.has_staged_log()) |
log_manager_.StageNextLogForUpload(); |
- SendStagedLog(); |
+ |
+ // Proceed to stage the log for upload if log size satisfies cellular log |
+ // upload constrains. |
+ if (client_->IsUMACellularUploadLogicEnabled() && |
+ !data_use_tracker_->ShouldUploadLogOnCellular( |
+ log_manager_.staged_log_hash().size())) { |
+ scheduler_->UploadCancelled(); |
+ } else { |
+ SendStagedLog(); |
+ } |
} |
bool MetricsService::ProvidersHaveInitialStabilityMetrics() { |