Updating the installer to check for OpenGL stats. Requires saving those stats and uploading with others which required a modification of the stats uploading code to actually save old stats--which it should do anyways.

Review URL: http://codereview.chromium.org/295043

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31502 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 3 deletions

diff --git a/o3d/statsreport/uploader_aggregation-mac.mm b/o3d/statsreport/uploader_aggregation-mac.mm
index c742490..ef564a0 100644
--- a/o3d/statsreport/uploader_aggregation-mac.mm
+++ b/o3d/statsreport/uploader_aggregation-mac.mm
@@ -128,10 +128,12 @@ void ResetPersistentMetrics() {
 //         were uploaded
 bool AggregateAndReportMetrics(const char* extra_url_arguments,
                                const char* user_agent,
-                               bool force_report) {
+                               bool force_report,
+                               bool save_old_metrics) {
   StatsUploader stats_uploader;
   return TestableAggregateAndReportMetrics(extra_url_arguments, user_agent,
-                                           force_report, &stats_uploader);
+                                           force_report, save_old_metrics,
+                                           &stats_uploader);
 }
 
 static int GetLastTransmissionTime() {
@@ -171,6 +173,7 @@ static void SetLastTransmissionTime(int when) {
 bool TestableAggregateAndReportMetrics(const char* extra_url_arguments,
                                        const char* user_agent,
                                        bool force_report,
+                                       bool save_old_metrics,
                                        StatsUploader* stats_uploader) {
   // Open the store
   MetricsAggregatorMac aggregator(g_global_metrics);
@@ -185,7 +188,7 @@ bool TestableAggregateAndReportMetrics(const char* extra_url_arguments,
   if (last_transmission_time == 0 || last_transmission_time > now) {
     LOG(WARNING) << "dodgy or missing last transmission time, wiping stats";
 
-    ResetPersistentMetrics();
+    if (!save_old_metrics) ResetPersistentMetrics();
 
     SetLastTransmissionTime(now);