Let MetricsService know about some Android Activities

chrome/browser/metrics/metrics_service.h

Index: chrome/browser/metrics/metrics_service.h
diff --git a/chrome/browser/metrics/metrics_service.h b/chrome/browser/metrics/metrics_service.h
index 2c5ea8a00ef5556f45a2068a6e8332e6a60cb677..8f6e2a0cc61303a743b8b321e84625925ac1e517 100644
--- a/chrome/browser/metrics/metrics_service.h
+++ b/chrome/browser/metrics/metrics_service.h
@@ -29,7 +29,9 @@
 #include "content/public/browser/user_metrics.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
-#if defined(OS_CHROMEOS)
+#if defined(OS_ANDROID)
+#include "chrome/browser/android/activity_type_ids.h"
+#elif defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/external_metrics.h"
 #endif
 
@@ -174,6 +176,9 @@ class MetricsService
   // At startup, prefs needs to be called with a list of all the pref names and
   // types we'll be using.
   static void RegisterPrefs(PrefRegistrySimple* registry);
+#if defined(OS_ANDROID)
+  static void RegisterPrefsAndroid(PrefRegistrySimple* registry);
+#endif  // defined(OS_ANDROID)
 
   // Set up notifications which indicate that a user is performing work. This is
   // useful to allow some features to sleep, until the machine becomes active,
@@ -202,6 +207,17 @@ class MetricsService
   // that session end was successful.
   void RecordCompletedSessionEnd();
 
+#if defined(OS_ANDROID)
+  // Called to record launch and crash stats to preferences.
+  void RecordAndroidStabilityPrefs();
+
+  // Called to record histograms.
+  void RecordAndroidStabilityHistograms();
+
+  // Called when the Activity that the user interacts with is swapped out.
+  void OnForegroundActivityChanged(ActivityTypeIds::Type type);
+#endif  // defined(OS_ANDROID)
+
 #if defined(OS_ANDROID) || defined(OS_IOS)
   // Called when the application is going into background mode.
   void OnAppEnterBackground();
@@ -345,6 +361,9 @@ class MetricsService
   // the old version (after an autoupdate has arrived), and so we'd bias
   // initial results towards showing crashes :-(.
   static void DiscardOldStabilityStats(PrefService* local_state);
+#if defined(OS_ANDROID)
+  static void DiscardOldStabilityStatsAndroid(PrefService* local_state);
+#endif  // defined(OS_ANDROID)
 
   // Turns recording on or off.
   // DisableRecording() also forces a persistent save of logging state (if