Introduce AndroidMetricsProvider class.

chrome/browser/metrics/metrics_service.cc

Index: chrome/browser/metrics/metrics_service.cc
===================================================================
--- chrome/browser/metrics/metrics_service.cc	(revision 271870)
+++ chrome/browser/metrics/metrics_service.cc	(working copy)
@@ -185,6 +185,7 @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/memory_details.h"
+#include "chrome/browser/metrics/android_metrics_provider_android.h"

[Ilya Sherman, 2014/05/21 09:15:28]

nit: Only for Android builds?

[Alexei Svitkine (slow), 2014/05/21 09:48:47]

Done.

 #include "chrome/browser/metrics/compression_utils.h"
 #include "chrome/browser/metrics/metrics_log.h"
 #include "chrome/browser/metrics/metrics_state_manager.h"
@@ -454,7 +455,8 @@
   registry->RegisterInt64Pref(prefs::kUninstallLastObservedRunTimeSec, 0);
 
 #if defined(OS_ANDROID)
-  RegisterPrefsAndroid(registry);
+  // TODO(asvitkine): Move this out of here.
+  AndroidMetricsProvider::RegisterPrefs(registry);
 #endif  // defined(OS_ANDROID)
 }
 
@@ -477,6 +479,13 @@
   DCHECK(IsSingleThreaded());
   DCHECK(state_manager_);
 
+#if defined(OS_ANDROID)
+  // TODO(asvitkine): Move this out of MetricsService.
+  RegisterMetricsProvider(
+      scoped_ptr<metrics::MetricsProvider>(new AndroidMetricsProvider(
+          g_browser_process->local_state())));
+#endif  // defined(OS_ANDROID)

[Ilya Sherman, 2014/05/21 09:15:28]

Hmm, why did you move this out of InitializeMetricsState()?  Are you sure that
either location is fine?

[Alexei Svitkine (slow), 2014/05/21 09:48:47]

Yes, either location is fine - as long as this happens during start up. The code
that gets run here merely looks at prefs (saved by previous session) and updates
other prefs.

+
   BrowserChildProcessObserver::Add(this);
 }
 
@@ -861,10 +870,6 @@
 
   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
@@ -1448,11 +1453,7 @@
       static_cast<MetricsLog*>(log_manager_.current_log());
   current_log->RecordStabilityMetrics(metrics_providers_.get(),
                                       base::TimeDelta(), base::TimeDelta());
-
-#if defined(OS_ANDROID)
-  ConvertAndroidStabilityPrefsToHistograms(pref);
   RecordCurrentStabilityHistograms();
-#endif  // defined(OS_ANDROID)
 
   // Note: RecordGeneralMetrics() intentionally not called since this log is for
   //       stability stats from a previous session only.
@@ -1492,10 +1493,6 @@
       static_cast<MetricsLog*>(log_manager_.current_log());
   current_log->RecordStabilityMetrics(metrics_providers_.get(),
                                       base::TimeDelta(), base::TimeDelta());
-
-#if defined(OS_ANDROID)
-  ConvertAndroidStabilityPrefsToHistograms(pref);
-#endif  // defined(OS_ANDROID)
   RecordCurrentHistograms();
 
   current_log->RecordGeneralMetrics(metrics_providers_.get());