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)) {
     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();
+#endif  // defined(OS_ANDROID)
   RecordCurrentHistograms();
 
   log_manager_.FinishCurrentLog();