Refactor Metrics

chrome/browser/ui/webui/performance_monitor/web_ui_handler.cc

Index: chrome/browser/ui/webui/performance_monitor/web_ui_handler.cc
diff --git a/chrome/browser/ui/webui/performance_monitor/web_ui_handler.cc b/chrome/browser/ui/webui/performance_monitor/web_ui_handler.cc
index 373125c830c01331cfa78c5a05064bdcc7330871..05b8432e4dd447221719368aa4d780b1e3c36ca8 100644
--- a/chrome/browser/ui/webui/performance_monitor/web_ui_handler.cc
+++ b/chrome/browser/ui/webui/performance_monitor/web_ui_handler.cc
@@ -10,6 +10,7 @@
 #include "base/values.h"
 #include "chrome/browser/performance_monitor/database.h"
 #include "chrome/browser/performance_monitor/event.h"
+#include "chrome/browser/performance_monitor/metric.h"
 #include "chrome/browser/performance_monitor/metric_details.h"
 #include "chrome/browser/performance_monitor/performance_monitor.h"
 #include "chrome/browser/performance_monitor/performance_monitor_util.h"
@@ -42,10 +43,9 @@ void DoGetActiveIntervals(ListValue* results,
 void DoGetEvents(ListValue* results, EventType event_type,
                  const base::Time& start, const base::Time& end) {
   Database* db = PerformanceMonitor::GetInstance()->database();
-  std::vector<linked_ptr<Event> > events =
-      db->GetEvents(event_type, start, end);
+  Database::EventVector events = db->GetEvents(event_type, start, end);
 
-  for (std::vector<linked_ptr<Event> >::iterator it = events.begin();
+  for (Database::EventVector::iterator it = events.begin();
        it != events.end(); ++it) {
     results->Append((*it)->data()->DeepCopy());
   }
@@ -61,14 +61,14 @@ void DoGetMetric(ListValue* results,
   Database::MetricVectorMap metric_vector_map =
       db->GetStatsForMetricByActivity(metric_type, start, end);
 
-  linked_ptr<Database::MetricInfoVector> metric_vector =
+  linked_ptr<Database::MetricVector> metric_vector =
       metric_vector_map[kProcessChromeAggregate];
   if (!metric_vector.get())
-    metric_vector.reset(new Database::MetricInfoVector());
+    metric_vector.reset(new Database::MetricVector());
 
-  Database::MetricInfoVector aggregated_metrics =
+  Database::MetricVector aggregated_metrics =
       util::AggregateMetric(*metric_vector, start, resolution);
-  for (Database::MetricInfoVector::iterator it = aggregated_metrics.begin();
+  for (Database::MetricVector::const_iterator it = aggregated_metrics.begin();
        it != aggregated_metrics.end(); ++it) {
     DictionaryValue* metric_value = new DictionaryValue();
     metric_value->SetDouble("time", it->time.ToJsTime());