Remove the provisional store and just store the staged log when writing to

components/metrics/metrics_log_manager_unittest.cc

 // Copyright 2014 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 "components/metrics/metrics_log_manager.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 160 matching lines @@
     EXPECT_FALSE(log_manager.has_unsent_logs());
     log_manager.LoadPersistedUnsentLogs();
     EXPECT_TRUE(log_manager.has_unsent_logs());
 
     log_manager.BeginLoggingWithLog(make_scoped_ptr(new MetricsLog(
         "id", 0, MetricsLog::INITIAL_STABILITY_LOG, &client, &pref_service)));
     log_manager.FinishCurrentLog();
     log_manager.BeginLoggingWithLog(make_scoped_ptr(new MetricsLog(
         "id", 0, MetricsLog::ONGOING_LOG, &client, &pref_service)));
     log_manager.StageNextLogForUpload();
-    log_manager.StoreStagedLogAsUnsent(PersistedLogs::NORMAL_STORE);
     log_manager.FinishCurrentLog();
 
     // Nothing should be written out until PersistUnsentLogs is called.
     EXPECT_EQ(0U, pref_service.TypeCount(MetricsLog::INITIAL_STABILITY_LOG));
     EXPECT_EQ(1U, pref_service.TypeCount(MetricsLog::ONGOING_LOG));
     log_manager.PersistUnsentLogs();
     EXPECT_EQ(1U, pref_service.TypeCount(MetricsLog::INITIAL_STABILITY_LOG));
     EXPECT_EQ(2U, pref_service.TypeCount(MetricsLog::ONGOING_LOG));
   }
 
@@ skipping 39 matching lines @@
   // Ensure that types are preserved when storing staged logs.
   {
     TestLogPrefService pref_service;
     MetricsLogManager log_manager(&pref_service, 0);
     log_manager.LoadPersistedUnsentLogs();
 
     log_manager.BeginLoggingWithLog(make_scoped_ptr(new MetricsLog(
         "id", 0, MetricsLog::ONGOING_LOG, &client, &pref_service)));
     log_manager.FinishCurrentLog();
     log_manager.StageNextLogForUpload();
-    log_manager.StoreStagedLogAsUnsent(PersistedLogs::NORMAL_STORE);
     log_manager.PersistUnsentLogs();
 
     EXPECT_EQ(0U, pref_service.TypeCount(MetricsLog::INITIAL_STABILITY_LOG));
     EXPECT_EQ(1U, pref_service.TypeCount(MetricsLog::ONGOING_LOG));
   }
 
   {
     TestLogPrefService pref_service;
     MetricsLogManager log_manager(&pref_service, 0);
     log_manager.LoadPersistedUnsentLogs();
 
     log_manager.BeginLoggingWithLog(make_scoped_ptr(new MetricsLog(
         "id", 0, MetricsLog::INITIAL_STABILITY_LOG, &client, &pref_service)));
     log_manager.FinishCurrentLog();
     log_manager.StageNextLogForUpload();
-    log_manager.StoreStagedLogAsUnsent(PersistedLogs::NORMAL_STORE);
     log_manager.PersistUnsentLogs();
 
     EXPECT_EQ(1U, pref_service.TypeCount(MetricsLog::INITIAL_STABILITY_LOG));
     EXPECT_EQ(0U, pref_service.TypeCount(MetricsLog::ONGOING_LOG));
   }
 }
 
 TEST(MetricsLogManagerTest, LargeLogDiscarding) {
   TestMetricsServiceClient client;
   TestLogPrefService pref_service;
   // Set the size threshold very low, to verify that it's honored.
   MetricsLogManager log_manager(&pref_service, 1);
   log_manager.LoadPersistedUnsentLogs();
 
   log_manager.BeginLoggingWithLog(make_scoped_ptr(new MetricsLog(
       "id", 0, MetricsLog::INITIAL_STABILITY_LOG, &client, &pref_service)));
   log_manager.FinishCurrentLog();
   log_manager.BeginLoggingWithLog(make_scoped_ptr(new MetricsLog(
       "id", 0, MetricsLog::ONGOING_LOG, &client, &pref_service)));
   log_manager.FinishCurrentLog();
 
   // Only the ongoing log should be written out, due to the threshold.
   log_manager.PersistUnsentLogs();
   EXPECT_EQ(1U, pref_service.TypeCount(MetricsLog::INITIAL_STABILITY_LOG));
   EXPECT_EQ(0U, pref_service.TypeCount(MetricsLog::ONGOING_LOG));
 }
 
-TEST(MetricsLogManagerTest, ProvisionalStoreStandardFlow) {
+TEST(MetricsLogManagerTest, DiscardOrder) {
+  // Ensure that the correct log is discarded if new logs are pushed while
+  // a log is staged.
   TestMetricsServiceClient client;
-
-  // Ensure that provisional store works, and discards the correct log.
   {
     TestLogPrefService pref_service;
     MetricsLogManager log_manager(&pref_service, 0);
     log_manager.LoadPersistedUnsentLogs();
 
     log_manager.BeginLoggingWithLog(make_scoped_ptr(new MetricsLog(
         "id", 0, MetricsLog::INITIAL_STABILITY_LOG, &client, &pref_service)));
     log_manager.FinishCurrentLog();
     log_manager.BeginLoggingWithLog(make_scoped_ptr(new MetricsLog(
         "id", 0, MetricsLog::ONGOING_LOG, &client, &pref_service)));
     log_manager.StageNextLogForUpload();
-    log_manager.StoreStagedLogAsUnsent(PersistedLogs::PROVISIONAL_STORE);
     log_manager.FinishCurrentLog();
-    log_manager.DiscardLastProvisionalStore();
+    log_manager.DiscardStagedLog();
 
     log_manager.PersistUnsentLogs();
     EXPECT_EQ(0U, pref_service.TypeCount(MetricsLog::INITIAL_STABILITY_LOG));
     EXPECT_EQ(1U, pref_service.TypeCount(MetricsLog::ONGOING_LOG));
   }
 }
-
-TEST(MetricsLogManagerTest, ProvisionalStoreNoop) {
-  TestMetricsServiceClient client;
-
-  // Ensure that trying to drop a sent log is a no-op, even if another log has
-  // since been staged.
-  {
-    TestLogPrefService pref_service;
-    MetricsLogManager log_manager(&pref_service, 0);
-    log_manager.LoadPersistedUnsentLogs();
-
-    log_manager.BeginLoggingWithLog(make_scoped_ptr(new MetricsLog(
-        "id", 0, MetricsLog::ONGOING_LOG, &client, &pref_service)));
-    log_manager.FinishCurrentLog();
-    log_manager.StageNextLogForUpload();
-    log_manager.StoreStagedLogAsUnsent(PersistedLogs::PROVISIONAL_STORE);
-    log_manager.StageNextLogForUpload();
-    log_manager.DiscardStagedLog();
-    log_manager.BeginLoggingWithLog(make_scoped_ptr(new MetricsLog(
-        "id", 0, MetricsLog::ONGOING_LOG, &client, &pref_service)));
-    log_manager.FinishCurrentLog();
-    log_manager.StageNextLogForUpload();
-    log_manager.StoreStagedLogAsUnsent(PersistedLogs::NORMAL_STORE);
-    log_manager.DiscardLastProvisionalStore();
-
-    log_manager.PersistUnsentLogs();
-    EXPECT_EQ(1U, pref_service.TypeCount(MetricsLog::ONGOING_LOG));
-  }
-
-  // Ensure that trying to drop more than once is a no-op
-  {
-    TestLogPrefService pref_service;
-    MetricsLogManager log_manager(&pref_service, 0);
-    log_manager.LoadPersistedUnsentLogs();
-
-    log_manager.BeginLoggingWithLog(make_scoped_ptr(new MetricsLog(
-        "id", 0, MetricsLog::ONGOING_LOG, &client, &pref_service)));
-    log_manager.FinishCurrentLog();
-    log_manager.StageNextLogForUpload();
-    log_manager.StoreStagedLogAsUnsent(PersistedLogs::NORMAL_STORE);
-    log_manager.BeginLoggingWithLog(make_scoped_ptr(new MetricsLog(
-        "id", 0, MetricsLog::ONGOING_LOG,  &client, &pref_service)));
-    log_manager.FinishCurrentLog();
-    log_manager.StageNextLogForUpload();
-    log_manager.StoreStagedLogAsUnsent(PersistedLogs::PROVISIONAL_STORE);
-    log_manager.DiscardLastProvisionalStore();
-    log_manager.DiscardLastProvisionalStore();
-
-    log_manager.PersistUnsentLogs();
-    EXPECT_EQ(1U, pref_service.TypeCount(MetricsLog::ONGOING_LOG));
-  }
-}
 
 }  // namespace metrics