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 b96af841a3031eb720b8eba5527e73456fd05c00..d80502324e3bf93bc4aa177920dbbbc22a5975c1 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(pref);
+#endif  // defined(OS_ANDROID)
+
   if (!pref->GetBoolean(prefs::kStabilityExitedCleanly)) {
     IncrementPrefValue(prefs::kStabilityCrashCount);
     // Reset flag, and wait until we call LogNeedForCleanShutdown() before
@@ -1536,6 +1548,10 @@ void MetricsService::PrepareInitialStabilityLog() {
   log_manager_.PauseCurrentLog();
   log_manager_.BeginLoggingWithLog(initial_stability_log.release(),
                                    MetricsLog::INITIAL_LOG);
+#if defined(OS_ANDROID)
+  RecordAndroidStabilityHistograms(pref);
+  RecordCurrentStabilityHistograms();

[Alexei Svitkine (slow), 2014/01/22 21:14:19]

The naming of these two functions is confusing. One is logging histograms while
the other is exporting them to the log. Can you pick different names for one or
the other or both, so that it's less confusing?

[Kibeom Kim (inactive), 2014/01/24 19:45:09]

Done.

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