diff options
| -rw-r--r-- | metricsd/include/metrics/metrics_library.h | 4 | ||||
| -rw-r--r-- | metricsd/metrics_library.cc | 7 | ||||
| -rw-r--r-- | metricsd/uploader/upload_service_test.cc | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/metricsd/include/metrics/metrics_library.h b/metricsd/include/metrics/metrics_library.h index 26df2f4737..5556e574c7 100644 --- a/metricsd/include/metrics/metrics_library.h +++ b/metricsd/include/metrics/metrics_library.h @@ -142,10 +142,10 @@ class MetricsLibrary : public MetricsLibraryInterface { bool* result); // Time at which we last checked if metrics were enabled. - static time_t cached_enabled_time_; + time_t cached_enabled_time_; // Cached state of whether or not metrics were enabled. - static bool cached_enabled_; + bool cached_enabled_; base::FilePath uma_events_file_; base::FilePath consent_file_; diff --git a/metricsd/metrics_library.cc b/metricsd/metrics_library.cc index 6449a2444f..310970405d 100644 --- a/metricsd/metrics_library.cc +++ b/metricsd/metrics_library.cc @@ -53,9 +53,6 @@ static const char *kCrosEventNames[] = { "TPM.EarlyResetDuringCommand", // 12 }; -time_t MetricsLibrary::cached_enabled_time_ = 0; -bool MetricsLibrary::cached_enabled_ = false; - MetricsLibrary::MetricsLibrary() {} MetricsLibrary::~MetricsLibrary() {} @@ -140,11 +137,15 @@ void MetricsLibrary::Init() { base::FilePath dir = base::FilePath(metrics::kMetricsDirectory); uma_events_file_ = dir.Append(metrics::kMetricsEventsFileName); consent_file_ = dir.Append(metrics::kConsentFileName); + cached_enabled_ = false; + cached_enabled_time_ = 0; } void MetricsLibrary::InitForTest(const base::FilePath& metrics_directory) { uma_events_file_ = metrics_directory.Append(metrics::kMetricsEventsFileName); consent_file_ = metrics_directory.Append(metrics::kConsentFileName); + cached_enabled_ = false; + cached_enabled_time_ = 0; } bool MetricsLibrary::SendToUMA(const std::string& name, diff --git a/metricsd/uploader/upload_service_test.cc b/metricsd/uploader/upload_service_test.cc index 0dd7db6e23..305fd0cb45 100644 --- a/metricsd/uploader/upload_service_test.cc +++ b/metricsd/uploader/upload_service_test.cc @@ -42,6 +42,8 @@ class UploadServiceTest : public testing::Test { chromeos_metrics::PersistentInteger::SetMetricsDirectory( dir_.path().value()); metrics_lib_.InitForTest(dir_.path()); + ASSERT_EQ(0, base::WriteFile( + dir_.path().Append(metrics::kConsentFileName), "", 0)); upload_service_.reset(new UploadService(new MockSystemProfileSetter(), &metrics_lib_, "", true)); |