Begin to separate the MetricsService logic for creating vs uploading logs

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 4280b44fdbd2d7f7710a2d339de0a18d86c37186..5a52bae470033b82aad55cb50cff1013855ad950 100644
--- a/chrome/browser/metrics/metrics_service.h
+++ b/chrome/browser/metrics/metrics_service.h
@@ -218,11 +218,14 @@ class MetricsService : public content::NotificationObserver,
   // Starts the process of uploading metrics data.
   void StartScheduledUpload();
 
-  // Do not call OnMemoryDetailCollectionDone() or
-  // OnHistogramSynchronizationDone() directly; use
-  // StartSchedulerIfNecessary() to schedule a call.
+  // Starts collecting any data that should be added to a log just before it is
+  // closed.
+  void StartFinalLogInfoCollection();
+  // Callbacks for various stages of final log info collection. Do not call
+  // these directly.
   void OnMemoryDetailCollectionDone();
   void OnHistogramSynchronizationDone();
+  void OnFinalLogInfoCollectionDone();
 
   // Takes whatever log should be uploaded next (according to the state_)
   // and makes it the staged log.  If there is already a staged log, this is a
@@ -232,6 +235,9 @@ class MetricsService : public content::NotificationObserver,
   // Record stats, client ID, Session ID, etc. in a special "first" log.
   void PrepareInitialLog();
 
+  // Uploads the currently staged log (which must be non-null).
+  void SendStagedLog();
+
   // Prepared the staged log to be passed to the server. Upon return,
   // current_fetch_ should be reset with its upload data set to a compressed
   // copy of the staged log.