Split a MetricsLogStore object out of MetricsLogManager.

components/metrics/metrics_log_manager.cc

Index: components/metrics/metrics_log_manager.cc
diff --git a/components/metrics/metrics_log_manager.cc b/components/metrics/metrics_log_manager.cc
index cc35bbd5346060135ae67927289eb389d1f64872..398b34d597f59fe3c15303686909d21268b0592d 100644
--- a/components/metrics/metrics_log_manager.cc
+++ b/components/metrics/metrics_log_manager.cc
@@ -9,52 +9,12 @@
 
 #include "base/strings/string_util.h"
 #include "components/metrics/metrics_log.h"
+#include "components/metrics/metrics_log_store.h"
 #include "components/metrics/metrics_pref_names.h"
-#include "components/metrics/persisted_logs_metrics_impl.h"
 
 namespace metrics {
 
-namespace {
-
-// The number of "initial" logs to save, and hope to send during a future Chrome
-// session.  Initial logs contain crash stats, and are pretty small.
-const size_t kInitialLogsPersistLimit = 20;
-
-// The number of ongoing logs to save persistently, and hope to
-// send during a this or future sessions.  Note that each log may be pretty
-// large, as presumably the related "initial" log wasn't sent (probably nothing
-// was, as the user was probably off-line).  As a result, the log probably kept
-// accumulating while the "initial" log was stalled, and couldn't be sent.  As a
-// result, we don't want to save too many of these mega-logs.
-// A "standard shutdown" will create a small log, including just the data that
-// was not yet been transmitted, and that is normal (to have exactly one
-// ongoing_log_ at startup).
-const size_t kOngoingLogsPersistLimit = 8;
-
-// The number of bytes each of initial and ongoing logs that must be stored.
-// This ensures that a reasonable amount of history will be stored even if there
-// is a long series of very small logs.
-const size_t kStorageByteLimitPerLogType = 300000;
-
-}  // namespace
-
-MetricsLogManager::MetricsLogManager(PrefService* local_state,
-                                     size_t max_ongoing_log_size)
-    : unsent_logs_loaded_(false),
-      initial_log_queue_(std::unique_ptr<PersistedLogsMetricsImpl>(
-                             new PersistedLogsMetricsImpl()),
-                         local_state,
-                         prefs::kMetricsInitialLogs,
-                         kInitialLogsPersistLimit,
-                         kStorageByteLimitPerLogType,
-                         0),
-      ongoing_log_queue_(std::unique_ptr<PersistedLogsMetricsImpl>(
-                             new PersistedLogsMetricsImpl()),
-                         local_state,
-                         prefs::kMetricsOngoingLogs,
-                         kOngoingLogsPersistLimit,
-                         kStorageByteLimitPerLogType,
-                         max_ongoing_log_size) {}
+MetricsLogManager::MetricsLogManager() {}
 
 MetricsLogManager::~MetricsLogManager() {}
 
@@ -63,33 +23,16 @@ void MetricsLogManager::BeginLoggingWithLog(std::unique_ptr<MetricsLog> log) {
   current_log_ = std::move(log);
 }
 
-void MetricsLogManager::FinishCurrentLog() {
+void MetricsLogManager::FinishCurrentLog(MetricsLogStore* log_store) {
   DCHECK(current_log_.get());
   current_log_->CloseLog();
   std::string log_data;
   current_log_->GetEncodedLog(&log_data);
   if (!log_data.empty())
-    StoreLog(log_data, current_log_->log_type());
+    log_store->StoreLog(log_data, current_log_->log_type());
   current_log_.reset();
 }
 
-void MetricsLogManager::StageNextLogForUpload() {
-  DCHECK(!has_staged_log());
-  if (!initial_log_queue_.empty())
-    initial_log_queue_.StageLog();
-  else
-    ongoing_log_queue_.StageLog();
-}
-
-void MetricsLogManager::DiscardStagedLog() {
-  DCHECK(has_staged_log());
-  if (initial_log_queue_.has_staged_log())
-    initial_log_queue_.DiscardStagedLog();
-  else
-    ongoing_log_queue_.DiscardStagedLog();
-  DCHECK(!has_staged_log());
-}
-
 void MetricsLogManager::DiscardCurrentLog() {
   current_log_->CloseLog();
   current_log_.reset();
@@ -105,31 +48,4 @@ void MetricsLogManager::ResumePausedLog() {
   current_log_ = std::move(paused_log_);
 }
 
-void MetricsLogManager::StoreLog(const std::string& log_data,
-                                 MetricsLog::LogType log_type) {
-  switch (log_type) {
-    case MetricsLog::INITIAL_STABILITY_LOG:
-      initial_log_queue_.StoreLog(log_data);
-      break;
-    case MetricsLog::ONGOING_LOG:
-      ongoing_log_queue_.StoreLog(log_data);
-      break;
-  }
-}
-
-void MetricsLogManager::PersistUnsentLogs() {
-  DCHECK(unsent_logs_loaded_);
-  if (!unsent_logs_loaded_)
-    return;
-
-  initial_log_queue_.SerializeLogs();
-  ongoing_log_queue_.SerializeLogs();
-}
-
-void MetricsLogManager::LoadPersistedUnsentLogs() {
-  initial_log_queue_.DeserializeLogs();
-  ongoing_log_queue_.DeserializeLogs();
-  unsent_logs_loaded_ = true;
-}
-
 }  // namespace metrics