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

components/metrics/persisted_logs_unittest.cc

Index: components/metrics/persisted_logs_unittest.cc
diff --git a/components/metrics/persisted_logs_unittest.cc b/components/metrics/persisted_logs_unittest.cc
index 27c230ce010eee2280c1c7523f9f6cbf69c03339..3e9c7fcd65fc0ce2b758242fb90e0810a462545b 100644
--- a/components/metrics/persisted_logs_unittest.cc
+++ b/components/metrics/persisted_logs_unittest.cc
@@ -240,7 +240,7 @@ TEST_F(PersistedLogsTest, Staging) {
   EXPECT_EQ(persisted_logs.staged_log(), Compress("two"));
   persisted_logs.StoreLog("three");
   EXPECT_EQ(persisted_logs.staged_log(), Compress("two"));
-  EXPECT_EQ(persisted_logs.size(), 2U);
+  EXPECT_EQ(persisted_logs.size(), 3U);
   persisted_logs.DiscardStagedLog();
   EXPECT_FALSE(persisted_logs.has_staged_log());
   EXPECT_EQ(persisted_logs.size(), 2U);
@@ -254,38 +254,15 @@ TEST_F(PersistedLogsTest, Staging) {
   EXPECT_EQ(persisted_logs.size(), 0U);
 }
 
-TEST_F(PersistedLogsTest, ProvisionalStoreStandardFlow) {
-  // Ensure that provisional store works, and discards the correct log.
+TEST_F(PersistedLogsTest, DiscardOrder) {
+  // Ensure that the correct log is discarded if new logs are pushed while
+  // a log is staged.
   TestPersistedLogs persisted_logs(&prefs_, kLogByteLimit);
 
   persisted_logs.StoreLog("one");
   persisted_logs.StageLog();
-  persisted_logs.StoreStagedLogAsUnsent(PersistedLogs::PROVISIONAL_STORE);
   persisted_logs.StoreLog("two");
-  persisted_logs.DiscardLastProvisionalStore();
-  persisted_logs.SerializeLogs();
-
-  TestPersistedLogs result_persisted_logs(&prefs_, kLogByteLimit);
-  EXPECT_EQ(PersistedLogs::RECALL_SUCCESS,
-            result_persisted_logs.DeserializeLogs());
-  EXPECT_EQ(1U, result_persisted_logs.size());
-  result_persisted_logs.ExpectNextLog("two");
-}
-
-TEST_F(PersistedLogsTest, ProvisionalStoreNoop1) {
-  // Ensure that trying to drop a sent log is a no-op, even if another log has
-  // since been staged.
-  TestPersistedLogs persisted_logs(&prefs_, kLogByteLimit);
-  persisted_logs.DeserializeLogs();
-  persisted_logs.StoreLog("one");
-  persisted_logs.StageLog();
-  persisted_logs.StoreStagedLogAsUnsent(PersistedLogs::PROVISIONAL_STORE);
-  persisted_logs.StageLog();
   persisted_logs.DiscardStagedLog();
-  persisted_logs.StoreLog("two");
-  persisted_logs.StageLog();
-  persisted_logs.StoreStagedLogAsUnsent(PersistedLogs::NORMAL_STORE);
-  persisted_logs.DiscardLastProvisionalStore();
   persisted_logs.SerializeLogs();
 
   TestPersistedLogs result_persisted_logs(&prefs_, kLogByteLimit);
@@ -295,28 +272,8 @@ TEST_F(PersistedLogsTest, ProvisionalStoreNoop1) {
   result_persisted_logs.ExpectNextLog("two");
 }
 
-TEST_F(PersistedLogsTest, ProvisionalStoreNoop2) {
-  // Ensure that trying to drop more than once is a no-op
-  TestPersistedLogs persisted_logs(&prefs_, kLogByteLimit);
-  persisted_logs.DeserializeLogs();
-  persisted_logs.StoreLog("one");
-  persisted_logs.StageLog();
-  persisted_logs.StoreStagedLogAsUnsent(PersistedLogs::NORMAL_STORE);
-  persisted_logs.StoreLog("two");
-  persisted_logs.StageLog();
-  persisted_logs.StoreStagedLogAsUnsent(PersistedLogs::PROVISIONAL_STORE);
-  persisted_logs.DiscardLastProvisionalStore();
-  persisted_logs.DiscardLastProvisionalStore();
-  persisted_logs.SerializeLogs();
-
-  TestPersistedLogs result_persisted_logs(&prefs_, kLogByteLimit);
-  EXPECT_EQ(PersistedLogs::RECALL_SUCCESS,
-            result_persisted_logs.DeserializeLogs());
-  EXPECT_EQ(1U, result_persisted_logs.size());
-  result_persisted_logs.ExpectNextLog("one");
-}
 
-TEST_F(PersistedLogsTest, Encoding) {
+TEST_F(PersistedLogsTest, Hashes) {
   const char kFooText[] = "foo";
   const std::string foo_hash = base::SHA1HashString(kFooText);