Let MetricsService know about some Android Activities

chrome/browser/metrics/metrics_service.cc

Index: chrome/browser/metrics/metrics_service.cc
diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc
index 8c008d7976a51ba2c3ebf495b2ca53217d722229..4aa90ab122b23b4fca1a779425f8118f118ee78f 100644
--- a/chrome/browser/metrics/metrics_service.cc
+++ b/chrome/browser/metrics/metrics_service.cc
@@ -484,6 +484,10 @@ void MetricsService::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterInt64Pref(prefs::kUninstallMetricsUptimeSec, 0);
   registry->RegisterInt64Pref(prefs::kUninstallLastLaunchTimeSec, 0);
   registry->RegisterInt64Pref(prefs::kUninstallLastObservedRunTimeSec, 0);
+
+#if defined(OS_ANDROID)
+  RegisterPrefsAndroid(registry);
+#endif  // defined(OS_ANDROID)
 }
 
 // static
@@ -512,6 +516,10 @@ void MetricsService::DiscardOldStabilityStats(PrefService* local_state) {
 
   local_state->ClearPref(prefs::kMetricsInitialLogs);
   local_state->ClearPref(prefs::kMetricsOngoingLogs);
+
+#if defined(OS_ANDROID)
+  DiscardOldStabilityStatsAndroid(local_state);
+#endif  // defined(OS_ANDROID)
 }
 
 MetricsService::MetricsService()
@@ -948,6 +956,10 @@ void MetricsService::InitializeMetricsState(ReportingState reporting_state) {
 
   session_id_ = pref->GetInteger(prefs::kMetricsSessionID);
 
+#if defined(OS_ANDROID)
+  RecordAndroidStabilityPrefs();
+#endif  // defined(OS_ANDROID)
+
   if (!pref->GetBoolean(prefs::kStabilityExitedCleanly)) {

[Ilya Sherman, 2013/12/20 23:28:21]

This check will probably need to be updated, so that Android stability stats are
included.  There are likely similar checks elsewhere that need to be updated as
well.

[gone, 2013/12/28 01:33:14]

The check should still hold: we're still counting on that stat to track when a
UMA session failed to end cleanly.  This CL just tries to make the crash
location a lot clearer.

     IncrementPrefValue(prefs::kStabilityCrashCount);
     // Reset flag, and wait until we call LogNeedForCleanShutdown() before
@@ -1276,6 +1288,9 @@ void MetricsService::CloseCurrentLog() {
   current_log->RecordStabilityMetrics(GetIncrementalUptime(pref),
                                       MetricsLog::ONGOING_LOG);
 
+#if defined(OS_ANDROID)
+  RecordAndroidStabilityHistograms();

[Alexei Svitkine (slow), 2013/12/23 16:28:01]

One problem with logging these as histograms (compared to system profile proto)
is that they won't be picked up by the initial stability log (which doesn't have
histograms).

The initial stability log was added to more correctly track stability for
experiments. Basically, the idea is that crashes from a previous session should
report correct field trial stats, and the initial stability log does this by
saving the system profile from the last session and using it for the initial
stability log.

So either these should be done as actual entries in the proto (which as Jim
points out would not be immediately supported by the dashboard without
server-side changes - though can still be queried manually) or to add a
mechanism that allows for adding a specific set of whitelisted histograms to the
initial stability log (right now the initial stability log has no histograms).
The latter approach would require actually implementing such a mechanism, but it
might not be very hard.

+#endif  // defined(OS_ANDROID)
   RecordCurrentHistograms();
 
   log_manager_.FinishCurrentLog();