Index: components/metrics/metrics_service.cc |
diff --git a/components/metrics/metrics_service.cc b/components/metrics/metrics_service.cc |
index c3ef7ec71d8dd9b69774d8c46a4a1ebb4196c61a..0c739f6f25e35c9b89f94119a9f48ce1548a6164 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); |
@@ -305,6 +307,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()); |
+ data_use_tracker_ = DataUseTracker::Create(local_state_); |
Alexei Svitkine (slow)
2016/04/07 15:43:29
Nit: Move this to the initializer list above.
gayane -on leave until 09-2017
2016/04/07 18:53:49
Done.
|
} |
MetricsService::~MetricsService() { |
@@ -545,6 +548,15 @@ void MetricsService::PushExternalLog(const std::string& log) { |
log_manager_.StoreLog(log, MetricsLog::ONGOING_LOG); |
} |
+UpdateUsagePrefCallbackType MetricsService::GetDataUseForwardingCallback() { |
+ DCHECK(IsSingleThreaded()); |
+ |
+ if (data_use_tracker_) |
Alexei Svitkine (slow)
2016/04/07 15:43:29
Nit: {}
gayane -on leave until 09-2017
2016/04/07 18:53:49
Done.
|
+ return data_use_tracker_->GetDataUseForwardingCallback( |
+ base::ThreadTaskRunnerHandle::Get()); |
+ return UpdateUsagePrefCallbackType(); |
+} |
+ |
//------------------------------------------------------------------------------ |
// private methods |
//------------------------------------------------------------------------------ |
@@ -866,7 +878,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() { |