Metrics log modification to handle external components.

components/metrics/metrics_log.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/metrics/metrics_log.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 38 matching lines @@
 
 namespace metrics {
 
 namespace {
 
 // Any id less than 16 bytes is considered to be a testing id.
 bool IsTestingID(const std::string& id) {
   return id.size() < 16;
 }
 
-// Returns the date at which the current metrics client ID was created as
-// a string containing seconds since the epoch, or "0" if none was found.
-std::string GetMetricsEnabledDate(PrefService* pref) {
-  if (!pref) {
-    NOTREACHED();
-    return "0";
-  }
-
-  return pref->GetString(prefs::kMetricsReportingEnabledTimestamp);
-}
-
 // Computes a SHA-1 hash of |data| and returns it as a hex string.
 std::string ComputeSHA1(const std::string& data) {
   const std::string sha1 = base::SHA1HashString(data);
   return base::HexEncode(sha1.data(), sha1.size());
 }
 
 void WriteFieldTrials(const std::vector<ActiveGroupId>& field_trial_ids,
                       SystemProfileProto* system_profile) {
   for (std::vector<ActiveGroupId>::const_iterator it =
        field_trial_ids.begin(); it != field_trial_ids.end(); ++it) {
@@ skipping 215 matching lines @@
   if (incremental_uptime_sec)
     stability->set_incremental_uptime_sec(incremental_uptime_sec);
   const uint64 uptime_sec = uptime.InSeconds();
   if (uptime_sec)
     stability->set_uptime_sec(uptime_sec);
 }
 
 void MetricsLog::RecordEnvironment(
     const std::vector<MetricsProvider*>& metrics_providers,
     const std::vector<variations::ActiveGroupId>& synthetic_trials,
-    int64 install_date) {
+    int64 install_date,
+    int64 metrics_reporting_enabled_date) {
   DCHECK(!HasEnvironment());
 
   SystemProfileProto* system_profile = uma_proto()->mutable_system_profile();
 
   std::string brand_code;
   if (client_->GetBrand(&brand_code))
     system_profile->set_brand_code(brand_code);
 
-  int enabled_date;
-  bool success =
-      base::StringToInt(GetMetricsEnabledDate(local_state_), &enabled_date);
-  DCHECK(success);
-
   // Reduce granularity of the enabled_date field to nearest hour.
-  system_profile->set_uma_enabled_date(RoundSecondsToHour(enabled_date));
+  system_profile->set_uma_enabled_date(
+      RoundSecondsToHour(metrics_reporting_enabled_date));
 
   // Reduce granularity of the install_date field to nearest hour.
   system_profile->set_install_date(RoundSecondsToHour(install_date));
 
   system_profile->set_application_locale(client_->GetApplicationLocale());
 
   SystemProfileProto::Hardware* hardware = system_profile->mutable_hardware();
 
   // HardwareModelName() will return an empty string on platforms where it's
   // not implemented or if an error occured.
@@ skipping 72 matching lines @@
   DCHECK(!closed_);
   closed_ = true;
 }
 
 void MetricsLog::GetEncodedLog(std::string* encoded_log) {
   DCHECK(closed_);
   uma_proto_.SerializeToString(encoded_log);
 }
 
 }  // namespace metrics