[Metrics] Re-try failed protocol buffer uploads as well as failed XML uploads.

chrome/common/metrics/metrics_log_manager_unittest.cc

 // 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.
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "chrome/common/metrics/metrics_log_base.h"
 #include "chrome/common/metrics/metrics_log_manager.h"
@@ skipping 51 matching lines @@
   EXPECT_FALSE(log_manager.has_staged_log());
 
   MetricsLogBase* second_log = new MetricsLogBase("id", 0, "version");
   log_manager.BeginLoggingWithLog(second_log, MetricsLogManager::ONGOING_LOG);
   EXPECT_EQ(second_log, log_manager.current_log());
 
   log_manager.StageNextLogForUpload();
   EXPECT_TRUE(log_manager.has_staged_log());
   EXPECT_FALSE(log_manager.staged_log_text().empty());
 
-  log_manager.DiscardStagedLog();
+  log_manager.DiscardStagedLogXml();
+  log_manager.DiscardStagedLogProto();
   EXPECT_EQ(second_log, log_manager.current_log());
   EXPECT_FALSE(log_manager.has_staged_log());
   EXPECT_FALSE(log_manager.has_unsent_logs());
   EXPECT_TRUE(log_manager.staged_log_text().empty());
 
   EXPECT_FALSE(log_manager.has_unsent_logs());
 }
 
 TEST(MetricsLogManagerTest, AbandonedLog) {
   MetricsLogManager log_manager;
@@ skipping 22 matching lines @@
   log_manager.BeginLoggingWithLog(temp_log, MetricsLogManager::INITIAL_LOG);
   EXPECT_EQ(temp_log, log_manager.current_log());
   log_manager.FinishCurrentLog();
   EXPECT_EQ(NULL, log_manager.current_log());
 
   log_manager.ResumePausedLog();
   EXPECT_EQ(ongoing_log, log_manager.current_log());
 
   EXPECT_FALSE(log_manager.has_staged_log());
   log_manager.StageNextLogForUpload();
-  log_manager.DiscardStagedLog();
+  log_manager.DiscardStagedLogXml();
+  log_manager.DiscardStagedLogProto();
   EXPECT_FALSE(log_manager.has_unsent_logs());
 }
 
 TEST(MetricsLogManagerTest, InterjectedLogPreservesType) {
   MetricsLogManager log_manager;
 
   MetricsLogBase* ongoing_log = new MetricsLogBase("id", 0, "version");
   MetricsLogBase* temp_log = new MetricsLogBase("id", 0, "version");
 
   log_manager.BeginLoggingWithLog(ongoing_log, MetricsLogManager::ONGOING_LOG);
   log_manager.PauseCurrentLog();
   log_manager.BeginLoggingWithLog(temp_log, MetricsLogManager::INITIAL_LOG);
   log_manager.FinishCurrentLog();
   log_manager.ResumePausedLog();
   log_manager.StageNextLogForUpload();
-  log_manager.DiscardStagedLog();
+  log_manager.DiscardStagedLogXml();
+  log_manager.DiscardStagedLogProto();
 
   // Verify that the remaining log (which is the original ongoing log) still
   // has the right type.
   DummyLogSerializer* serializer = new DummyLogSerializer;
   log_manager.set_log_serializer(serializer);
   log_manager.FinishCurrentLog();
   log_manager.PersistUnsentLogs();
   EXPECT_EQ(0U, serializer->TypeCount(MetricsLogManager::INITIAL_LOG));
   EXPECT_EQ(1U, serializer->TypeCount(MetricsLogManager::ONGOING_LOG));
 }
@@ skipping 45 matching lines @@
 
     DummyLogSerializer* serializer = new DummyLogSerializer;
     serializer->persisted_logs_[MetricsLogManager::INITIAL_LOG] = initial_logs;
     serializer->persisted_logs_[MetricsLogManager::ONGOING_LOG] = ongoing_logs;
 
     log_manager.set_log_serializer(serializer);
     log_manager.LoadPersistedUnsentLogs();
     EXPECT_TRUE(log_manager.has_unsent_logs());
 
     log_manager.StageNextLogForUpload();
-    log_manager.DiscardStagedLog();
+    log_manager.DiscardStagedLogXml();
+    log_manager.DiscardStagedLogProto();
     // The initial log should be sent first; update the persisted storage to
     // verify.
     log_manager.PersistUnsentLogs();
     EXPECT_EQ(0U, serializer->TypeCount(MetricsLogManager::INITIAL_LOG));
     EXPECT_EQ(2U, serializer->TypeCount(MetricsLogManager::ONGOING_LOG));
 
     // Handle the first ongoing log.
     log_manager.StageNextLogForUpload();
-    log_manager.DiscardStagedLog();
+    log_manager.DiscardStagedLogXml();
+    log_manager.DiscardStagedLogProto();
     EXPECT_TRUE(log_manager.has_unsent_logs());
 
     // Handle the last log.
     log_manager.StageNextLogForUpload();
-    log_manager.DiscardStagedLog();
+    log_manager.DiscardStagedLogXml();
+    log_manager.DiscardStagedLogProto();
     EXPECT_FALSE(log_manager.has_unsent_logs());
 
     // Nothing should have changed "on disk" since PersistUnsentLogs hasn't been
     // called again.
     EXPECT_EQ(2U, serializer->TypeCount(MetricsLogManager::ONGOING_LOG));
     // Persist, and make sure nothing is left.
     log_manager.PersistUnsentLogs();
     EXPECT_EQ(0U, serializer->TypeCount(MetricsLogManager::INITIAL_LOG));
     EXPECT_EQ(0U, serializer->TypeCount(MetricsLogManager::ONGOING_LOG));
   }
@@ skipping 81 matching lines @@
   // since been staged.
   {
     MetricsLogManager log_manager;
     MetricsLogBase* log1 = new MetricsLogBase("id", 0, "version");
     MetricsLogBase* log2 = new MetricsLogBase("id", 0, "version");
     log_manager.BeginLoggingWithLog(log1, MetricsLogManager::ONGOING_LOG);
     log_manager.FinishCurrentLog();
     log_manager.StageNextLogForUpload();
     log_manager.StoreStagedLogAsUnsent(MetricsLogManager::PROVISIONAL_STORE);
     log_manager.StageNextLogForUpload();
-    log_manager.DiscardStagedLog();
+    log_manager.DiscardStagedLogXml();
+    log_manager.DiscardStagedLogProto();
     log_manager.BeginLoggingWithLog(log2, MetricsLogManager::ONGOING_LOG);
     log_manager.FinishCurrentLog();
     log_manager.StageNextLogForUpload();
     log_manager.StoreStagedLogAsUnsent(MetricsLogManager::NORMAL_STORE);
     log_manager.DiscardLastProvisionalStore();
 
     DummyLogSerializer* serializer = new DummyLogSerializer;
     log_manager.set_log_serializer(serializer);
     log_manager.PersistUnsentLogs();
     EXPECT_EQ(1U, serializer->TypeCount(MetricsLogManager::ONGOING_LOG));
@@ skipping 14 matching lines @@
     log_manager.StoreStagedLogAsUnsent(MetricsLogManager::PROVISIONAL_STORE);
     log_manager.DiscardLastProvisionalStore();
     log_manager.DiscardLastProvisionalStore();
 
     DummyLogSerializer* serializer = new DummyLogSerializer;
     log_manager.set_log_serializer(serializer);
     log_manager.PersistUnsentLogs();
     EXPECT_EQ(1U, serializer->TypeCount(MetricsLogManager::ONGOING_LOG));
   }
 }
+
+// Test that discarding just the XML log, then the protobuf log, works.
+TEST(MetricsLogManagerTest, DiscardXmlLogFirst) {
+  MetricsLogManager log_manager;
+  EXPECT_FALSE(log_manager.has_staged_log());
+  EXPECT_FALSE(log_manager.has_staged_log_xml());
+  EXPECT_FALSE(log_manager.has_staged_log_proto());
+
+  MetricsLogBase* initial_log = new MetricsLogBase("id", 0, "version");
+  log_manager.BeginLoggingWithLog(initial_log, MetricsLogManager::INITIAL_LOG);
+  log_manager.FinishCurrentLog();
+  EXPECT_FALSE(log_manager.has_staged_log());
+  EXPECT_FALSE(log_manager.has_staged_log_xml());
+  EXPECT_FALSE(log_manager.has_staged_log_proto());
+
+  log_manager.StageNextLogForUpload();
+  EXPECT_TRUE(log_manager.has_staged_log());
+  EXPECT_TRUE(log_manager.has_staged_log_xml());
+  EXPECT_TRUE(log_manager.has_staged_log_proto());
+  EXPECT_FALSE(log_manager.staged_log_text().empty());
+
+  log_manager.DiscardStagedLogXml();
+  EXPECT_TRUE(log_manager.has_staged_log());
+  EXPECT_FALSE(log_manager.has_staged_log_xml());
+  EXPECT_TRUE(log_manager.has_staged_log_proto());
+  EXPECT_FALSE(log_manager.staged_log_text().empty());
+
+  log_manager.DiscardStagedLogProto();
+  EXPECT_FALSE(log_manager.has_staged_log());
+  EXPECT_FALSE(log_manager.has_staged_log_xml());
+  EXPECT_FALSE(log_manager.has_staged_log_proto());
+  EXPECT_TRUE(log_manager.staged_log_text().empty());
+}
+
+// Test that discarding just the protobuf log, then the XML log, works.
+TEST(MetricsLogManagerTest, DiscardProtoLogFirst) {
+  MetricsLogManager log_manager;
+  EXPECT_FALSE(log_manager.has_staged_log());
+  EXPECT_FALSE(log_manager.has_staged_log_xml());
+  EXPECT_FALSE(log_manager.has_staged_log_proto());
+
+  MetricsLogBase* initial_log = new MetricsLogBase("id", 0, "version");
+  log_manager.BeginLoggingWithLog(initial_log, MetricsLogManager::INITIAL_LOG);
+  log_manager.FinishCurrentLog();
+  EXPECT_FALSE(log_manager.has_staged_log());
+  EXPECT_FALSE(log_manager.has_staged_log_xml());
+  EXPECT_FALSE(log_manager.has_staged_log_proto());
+
+  log_manager.StageNextLogForUpload();
+  EXPECT_TRUE(log_manager.has_staged_log());
+  EXPECT_TRUE(log_manager.has_staged_log_xml());
+  EXPECT_TRUE(log_manager.has_staged_log_proto());
+  EXPECT_FALSE(log_manager.staged_log_text().empty());
+
+  log_manager.DiscardStagedLogProto();
+  EXPECT_TRUE(log_manager.has_staged_log());
+  EXPECT_TRUE(log_manager.has_staged_log_xml());
+  EXPECT_FALSE(log_manager.has_staged_log_proto());
+  EXPECT_FALSE(log_manager.staged_log_text().empty());
+
+  log_manager.DiscardStagedLogXml();
+  EXPECT_FALSE(log_manager.has_staged_log());
+  EXPECT_FALSE(log_manager.has_staged_log_xml());
+  EXPECT_FALSE(log_manager.has_staged_log_proto());
+  EXPECT_TRUE(log_manager.staged_log_text().empty());
+}