Merge MetricsLog and MetricsLogBase.

components/metrics/metrics_log_manager.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 <algorithm>
 
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
 #include "base/timer/elapsed_timer.h"
-#include "components/metrics/metrics_log_base.h"
+#include "components/metrics/metrics_log.h"
 #include "components/metrics/metrics_pref_names.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;
 
@@ skipping 24 matching lines @@
                          kStorageByteLimitPerLogType,
                          0),
       ongoing_log_queue_(local_state,
                          prefs::kMetricsOngoingLogs,
                          kOngoingLogsPersistLimit,
                          kStorageByteLimitPerLogType,
                          max_ongoing_log_size) {}
 
 MetricsLogManager::~MetricsLogManager() {}
 
-void MetricsLogManager::BeginLoggingWithLog(scoped_ptr<MetricsLogBase> log) {
+void MetricsLogManager::BeginLoggingWithLog(scoped_ptr<MetricsLog> log) {
   DCHECK(!current_log_);
   current_log_ = log.Pass();
 }
 
 void MetricsLogManager::FinishCurrentLog() {
   DCHECK(current_log_.get());
   current_log_->CloseLog();
   std::string log_text;
   current_log_->GetEncodedLog(&log_text);
   if (!log_text.empty())
@@ skipping 26 matching lines @@
 void MetricsLogManager::PauseCurrentLog() {
   DCHECK(!paused_log_.get());
   paused_log_.reset(current_log_.release());
 }
 
 void MetricsLogManager::ResumePausedLog() {
   DCHECK(!current_log_.get());
   current_log_.reset(paused_log_.release());
 }
 
-void MetricsLogManager::StoreLog(std::string* log, LogType log_type) {
+void MetricsLogManager::StoreLog(std::string* log,
+                                 MetricsLog::LogType log_type) {
   switch (log_type) {
-    case MetricsLogBase::INITIAL_STABILITY_LOG:
+    case MetricsLog::INITIAL_STABILITY_LOG:
       initial_log_queue_.StoreLog(log);
       break;
-    case MetricsLogBase::ONGOING_LOG:
+    case MetricsLog::ONGOING_LOG:
       ongoing_log_queue_.StoreLog(log);
       break;
   }
 }
 
 void MetricsLogManager::StoreStagedLogAsUnsent(
     metrics::PersistedLogs::StoreType store_type) {
   DCHECK(has_staged_log());
   if (initial_log_queue_.has_staged_log())
     initial_log_queue_.StoreStagedLogAsUnsent(store_type);
@@ skipping 21 matching lines @@
 
 void MetricsLogManager::LoadPersistedUnsentLogs() {
   base::ElapsedTimer timer;
   initial_log_queue_.DeserializeLogs();
   ongoing_log_queue_.DeserializeLogs();
   UMA_HISTOGRAM_TIMES("UMA.LoadLogsTime", timer.Elapsed());
 
   unsent_logs_loaded_ = true;
 }
 
-} // namespace metrics
+}  // namespace metrics