Metrics log modification to handle external components.

components/metrics/metrics_service.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.
 
 //------------------------------------------------------------------------------
 // Description of the life cycle of a instance of MetricsService.
 //
 //  OVERVIEW
 //
 // A MetricsService instance is typically created at application startup.  It is
@@ skipping 335 matching lines @@
 }
 
 std::string MetricsService::GetClientId() {
   return state_manager_->client_id();
 }
 
 int64 MetricsService::GetInstallDate() {
   return local_state_->GetInt64(prefs::kInstallDate);
 }
 
+int64 MetricsService::GetMetricsReportingEnabledDate() {
+  return local_state_->GetInt64(prefs::kMetricsReportingEnabledTimestamp);
+}
+
 scoped_ptr<const base::FieldTrial::EntropyProvider>
 MetricsService::CreateEntropyProvider() {
   // TODO(asvitkine): Refactor the code so that MetricsService does not expose
   // this method.
   return state_manager_->CreateEntropyProvider();
 }
 
 void MetricsService::EnableRecording() {
   DCHECK(IsSingleThreaded());
 
@@ skipping 145 matching lines @@
 
   // Reset the prefs that are managed by MetricsService/MetricsLog directly.
   local_state_->SetInteger(prefs::kStabilityCrashCount, 0);
   local_state_->SetInteger(prefs::kStabilityExecutionPhase,
                            UNINITIALIZED_PHASE);
   local_state_->SetInteger(prefs::kStabilityIncompleteSessionEndCount, 0);
   local_state_->SetInteger(prefs::kStabilityLaunchCount, 0);
   local_state_->SetBoolean(prefs::kStabilitySessionEndCompleted, true);
 }
 
+void MetricsService::PushExternalLog(const std::string& log) {
+  log_manager_.StoreLog(log, MetricsLog::ONGOING_LOG);
+}
+
 //------------------------------------------------------------------------------
 // private methods
 //------------------------------------------------------------------------------
 
 
 //------------------------------------------------------------------------------
 // Initialization methods
 
 void MetricsService::InitializeMetricsState() {
   const int64 buildtime = MetricsLog::GetBuildTime();
@@ skipping 548 matching lines @@
                                         session_id_,
                                         log_type,
                                         client_,
                                         local_state_));
 }
 
 void MetricsService::RecordCurrentEnvironment(MetricsLog* log) {
   std::vector<variations::ActiveGroupId> synthetic_trials;
   GetCurrentSyntheticFieldTrials(&synthetic_trials);
   log->RecordEnvironment(metrics_providers_.get(), synthetic_trials,
-                         GetInstallDate());
+                         GetInstallDate(), GetMetricsReportingEnabledDate());
   UMA_HISTOGRAM_COUNTS_100("UMA.SyntheticTrials.Count",
                            synthetic_trials.size());
 }
 
 void MetricsService::RecordCurrentHistograms() {
   DCHECK(log_manager_.current_log());
   histogram_snapshot_manager_.PrepareDeltas(
       base::Histogram::kNoFlags, base::Histogram::kUmaTargetedHistogramFlag);
 }
 
@@ skipping 29 matching lines @@
   local_state_->SetBoolean(path, value);
   RecordCurrentState(local_state_);
 }
 
 void MetricsService::RecordCurrentState(PrefService* pref) {
   pref->SetInt64(prefs::kStabilityLastTimestampSec,
                  base::Time::Now().ToTimeT());
 }
 
 }  // namespace metrics