Begin to separate the MetricsService logic for creating vs uploading logs

chrome/browser/metrics/metrics_service.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file defines a service that collects information about the user
 // experience in order to help improve future versions of the app.
 
 #ifndef CHROME_BROWSER_METRICS_METRICS_SERVICE_H_
 #define CHROME_BROWSER_METRICS_METRICS_SERVICE_H_
 #pragma once
@@ skipping 200 matching lines @@
   // Called when Chrome shuts down.
   void PushPendingLogsToPersistentStorage();
 
   // Ensures that scheduler is running, assuming the current settings are such
   // that metrics should be reported. If not, this is a no-op.
   void StartSchedulerIfNecessary();
 
   // 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
   // no-op.
   void MakeStagedLog();
 
   // 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.
   void PrepareFetchWithStagedLog();
 
   // Implementation of content::URLFetcherDelegate. Called after transmission
   // completes (either successfully or with failure).
   virtual void OnURLFetchComplete(const content::URLFetcher* source) OVERRIDE;
 
   // Logs debugging details, for the case where the server returns a response
@@ skipping 166 matching lines @@
   friend class InstantFieldTrial;
   friend bool prerender::IsOmniboxEnabled(Profile* profile);
 
   // Returns true if prefs::kMetricsReportingEnabled is set.
   static bool IsMetricsReportingEnabled();
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(MetricsServiceHelper);
 };
 
 #endif  // CHROME_BROWSER_METRICS_METRICS_SERVICE_H_