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 98543ebe40ed246c747dfdaf1cb586fdbb4dcee7..0307d6ca5f01b76b881e7f646a441f9daa81a80d 100644
--- a/chrome/browser/metrics/metrics_service.cc
+++ b/chrome/browser/metrics/metrics_service.cc
@@ -466,6 +466,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
@@ -494,6 +498,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()
@@ -927,6 +935,10 @@ void MetricsService::InitializeMetricsState() {
   // Stability bookkeeping
   IncrementPrefValue(prefs::kStabilityLaunchCount);
 
+#if defined(OS_ANDROID)
+  RecordAndroidStabilityPrefs();
+#endif  // defined(OS_ANDROID)

[Ilya Sherman, 2013/12/16 23:54:59]

I think this line needs to be moved after Alexei's CL [
https://codereview.chromium.org/81603002/ ], which just recently landed.

[gone, 2013/12/17 01:34:31]

I guess something definitely has to be done for this CL, but that's not entirely
clear since his CL splits apart incrementing the crash stat from the launch
count stat (among a lot of other things).  I'll take a look...

+
   if (!pref->GetBoolean(prefs::kStabilityExitedCleanly)) {
     IncrementPrefValue(prefs::kStabilityCrashCount);
     // Reset flag, and wait until we call LogNeedForCleanShutdown() before
@@ -1241,6 +1253,9 @@ void MetricsService::CloseCurrentLog() {
   current_log->RecordStabilityMetrics(GetIncrementalUptime(pref),
                                       MetricsLog::ONGOING_LOG);
 
+#if defined(OS_ANDROID)
+  RecordAndroidStabilityHistograms();
+#endif  // defined(OS_ANDROID)
   RecordCurrentHistograms();
 
   log_manager_.FinishCurrentLog();