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 cc90ada54e8ee3e789ce35f2cc47dd2c1d611b40..71b35bd299ce7c090082723512de9c7901d45b2c 100644
--- a/chrome/browser/metrics/metrics_service.cc
+++ b/chrome/browser/metrics/metrics_service.cc
@@ -482,6 +482,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
@@ -510,6 +514,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()
@@ -946,6 +954,10 @@ void MetricsService::InitializeMetricsState(ReportingState reporting_state) {
 
   session_id_ = pref->GetInteger(prefs::kMetricsSessionID);
 
+#if defined(OS_ANDROID)
+  LogAndroidStabilityToPrefs(pref);
+#endif  // defined(OS_ANDROID)
+
   if (!pref->GetBoolean(prefs::kStabilityExitedCleanly)) {
     IncrementPrefValue(prefs::kStabilityCrashCount);
     // Reset flag, and wait until we call LogNeedForCleanShutdown() before
@@ -1274,6 +1286,9 @@ void MetricsService::CloseCurrentLog() {
   current_log->RecordStabilityMetrics(GetIncrementalUptime(pref),
                                       MetricsLog::ONGOING_LOG);
 
+#if defined(OS_ANDROID)
+  ConvertAndroidStabilityPrefsToHistograms(pref);

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

dfalcantara@ -- Q : This was in your last patch set, but we're only updating
prefs in MetricsService::InitializeMetricsState(...), so I think this line can
be removed. Could you confirm it? Just to make sure.

[gone, 2014/01/24 20:03:07]

Yeah, I think it should be fine.  I think you moved it down to where it actually
needs to happen...

[Kibeom Kim (inactive), 2014/01/24 23:21:34]

Done.

+#endif  // defined(OS_ANDROID)
   RecordCurrentHistograms();
 
   log_manager_.FinishCurrentLog();
@@ -1534,6 +1549,10 @@ void MetricsService::PrepareInitialStabilityLog() {
   log_manager_.PauseCurrentLog();
   log_manager_.BeginLoggingWithLog(initial_stability_log.release(),
                                    MetricsLog::INITIAL_LOG);
+#if defined(OS_ANDROID)
+  ConvertAndroidStabilityPrefsToHistograms(pref);
+  RecordCurrentStabilityHistograms();
+#endif  // defined(OS_ANDROID)
   log_manager_.FinishCurrentLog();
   log_manager_.ResumePausedLog();
 
@@ -1560,6 +1579,9 @@ void MetricsService::PrepareInitialMetricsLog(MetricsLog::LogType log_type) {
   // before writing them.
   log_manager_.PauseCurrentLog();
   log_manager_.BeginLoggingWithLog(initial_metrics_log_.release(), log_type);
+#if defined(OS_ANDROID)
+  ConvertAndroidStabilityPrefsToHistograms(pref);
+#endif  // defined(OS_ANDROID)
   RecordCurrentHistograms();
   log_manager_.FinishCurrentLog();
   log_manager_.ResumePausedLog();