Refactor Metrics

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

 // Copyright (c) 2012 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 "chrome/browser/ui/webui/performance_monitor/web_ui_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/time.h"
 #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"
 #include "chrome/common/extensions/value_builder.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_ui.h"
 
 namespace performance_monitor {
 namespace {
 
@@ skipping 12 matching lines @@
     results->Append(interval_value);
   }
 }
 
 // Queries the performance monitor database for events of type |event_type|
 // between |start| and |end| times and appends the results to |results|.
 // TODO(mtytel): Add an internationalized longDescription field to each event.
 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());
   }
 }
 
 // Queries the performance monitor database for metrics of type |metric_type|
 // between |start| and |end| times and appends the results to |results|.
 void DoGetMetric(ListValue* results,
                  MetricType metric_type,
                  const base::Time& start, const base::Time& end,
                  const base::TimeDelta& resolution) {
   Database* db = PerformanceMonitor::GetInstance()->database();
   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());
     metric_value->SetDouble("value", it->value);
     results->Append(metric_value);
   }
 }
 
 }  // namespace
 
@@ skipping 138 matching lines @@
   util::PostTaskToDatabaseThreadAndReply(
       FROM_HERE,
       base::Bind(&DoGetMetric, points_results, metric_type,
                  start, end, resolution),
       base::Bind(&WebUIHandler::ReturnResults, AsWeakPtr(),
                  "PerformanceMonitor.getMetricCallback",
                  base::Owned(results)));
 }
 
 }  // namespace performance_monitor