Merge MetricsLog and MetricsLogBase.

components/metrics/metrics_log_manager.cc

Index: components/metrics/metrics_log_manager.cc
===================================================================
--- components/metrics/metrics_log_manager.cc	(revision 275440)
+++ components/metrics/metrics_log_manager.cc	(working copy)
@@ -9,7 +9,7 @@
 #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 {
@@ -54,7 +54,7 @@
 
 MetricsLogManager::~MetricsLogManager() {}
 
-void MetricsLogManager::BeginLoggingWithLog(scoped_ptr<MetricsLogBase> log) {
+void MetricsLogManager::BeginLoggingWithLog(scoped_ptr<MetricsLog> log) {
   DCHECK(!current_log_);
   current_log_ = log.Pass();
 }
@@ -101,12 +101,13 @@
   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;
   }
@@ -148,4 +149,4 @@
   unsent_logs_loaded_ = true;
 }
 
-} // namespace metrics
+}  // namespace metrics