Starting a refactor to allow adding metrics on upload.

chrome/browser/metrics/android_metrics_provider.h

Index: chrome/browser/metrics/android_metrics_provider.h
diff --git a/chrome/browser/metrics/android_metrics_provider.h b/chrome/browser/metrics/android_metrics_provider.h
index 31a2dbe004a53b8ab8fa8c8685cd2bdc9e3478c4..cfa5b6c15797cea5a5d03bcaa96d5bb1ecc8965f 100644
--- a/chrome/browser/metrics/android_metrics_provider.h
+++ b/chrome/browser/metrics/android_metrics_provider.h
@@ -19,11 +19,14 @@ class AndroidMetricsProvider : public metrics::MetricsProvider {
   explicit AndroidMetricsProvider(PrefService* local_state);
   virtual ~AndroidMetricsProvider();
 
+  // metrics::MetricsProvider:

[Alexei Svitkine (slow), 2014/10/17 18:30:52]

Can you put this in the same section as ProvideStabilityMetrics() below?

[Maria, 2014/10/17 21:44:50]

This file needs to be generally reordered as the cc implementation order doesn't
match the declared order in this file. I added this here to avoid making the
problem worse. I am planning to put in a CL immediately after this to fix the
ordering issue. How about I reorder it then?

[Alexei Svitkine (slow), 2014/10/20 15:47:00]

That sounds fine to me, thanks!

+  void OnCollectFinalMetrics() override;
+
   // Called when the Activity that the user interacts with is swapped out.
   // TODO(asvitkine): Expose a way for Android code to actually invoke this.
   void OnForegroundActivityChanged(ActivityTypeIds::Type type);
 
-  // metrics::MetricsDataProvider:
+  // metrics::MetricsProvider:
   virtual void ProvideStabilityMetrics(
       metrics::SystemProfileProto* system_profile_proto) override;