Refactor Metrics

chrome/browser/performance_monitor/database.h

Index: chrome/browser/performance_monitor/database.h
diff --git a/chrome/browser/performance_monitor/database.h b/chrome/browser/performance_monitor/database.h
index 2c61e4641770769329d9f984e1842b7cfa32b34c..d95b8a0aa42a56bf2d4f26034740b6dfc9e7d5b0 100644
--- a/chrome/browser/performance_monitor/database.h
+++ b/chrome/browser/performance_monitor/database.h
@@ -16,8 +16,7 @@
 #include "base/time.h"
 #include "chrome/browser/performance_monitor/constants.h"
 #include "chrome/browser/performance_monitor/event.h"
-#include "chrome/browser/performance_monitor/metric_info.h"
-#include "chrome/browser/performance_monitor/metric_details.h"
+#include "chrome/browser/performance_monitor/metric.h"
 #include "third_party/leveldatabase/src/include/leveldb/db.h"
 
 namespace performance_monitor {
@@ -89,9 +88,8 @@ struct TimeRange {
 class Database {
  public:
   typedef std::vector<linked_ptr<Event> > EventList;
-  typedef std::set<EventType> EventTypeSet;

[eaugusti, 2012/08/17 21:06:04]

I think EventTypeSet should stay alive.

-  typedef std::vector<MetricInfo> MetricInfoVector;
-  typedef std::map<std::string, linked_ptr<MetricInfoVector> > MetricVectorMap;
+  typedef std::map<std::string, linked_ptr<std::vector<Metric> > >
+     MetricVectorMap;
 
   static const char kDatabaseSequenceToken[];
 
@@ -134,9 +132,10 @@ class Database {
     return GetEvents(EVENT_UNDEFINED, base::Time(), clock_->GetTime());
   }
 
-  EventTypeSet GetEventTypes(const base::Time& start, const base::Time& end);
+  std::set<EventType> GetEventTypes(const base::Time& start,
+                                    const base::Time& end);
 
-  EventTypeSet GetEventTypes() {
+  std::set<EventType> GetEventTypes() {
     return GetEventTypes(base::Time(), clock_->GetTime());
   }
 
@@ -151,45 +150,45 @@ class Database {
 
   // Get the metrics that are active for the given process between |start|
   // (inclusive) and |end| (exclusive).
-  std::vector<const MetricDetails*> GetActiveMetrics(const base::Time& start,
-                                                     const base::Time& end);
+  std::set<MetricType> GetActiveMetrics(const base::Time& start,
+                                        const base::Time& end);
 
   // Get the activities that are active for the given metric after |start|.
-  std::vector<std::string> GetActiveActivities(MetricType metric_type,
-                                               const base::Time& start);
+  std::set<std::string> GetActiveActivities(MetricType metric_type,
+                                            const base::Time& start);
 
   // Populate info with the most recent activity. Return false if populate
   // was unsuccessful.
   bool GetRecentStatsForActivityAndMetric(const std::string& activity,
                                           MetricType metric,
-                                          MetricInfo* info);
+                                          Metric* info);
 
-  bool GetRecentStatsForActivityAndMetric(MetricType metric, MetricInfo* info) {
+  bool GetRecentStatsForActivityAndMetric(MetricType metric, Metric* info) {
     return GetRecentStatsForActivityAndMetric(kProcessChromeAggregate,
                                               metric,
                                               info);
   }
 
   // Query given |metric_type| and |activity|.
-  MetricInfoVector GetStatsForActivityAndMetric(const std::string& activity,
-                                                MetricType metric_type,
-                                                const base::Time& start,
-                                                const base::Time& end);
-
-  MetricInfoVector GetStatsForActivityAndMetric(MetricType metric_type,
-                                                const base::Time& start,
-                                                const base::Time& end) {
+  std::vector<Metric> GetStatsForActivityAndMetric(const std::string& activity,
+                                                   MetricType metric_type,
+                                                   const base::Time& start,
+                                                   const base::Time& end);
+
+  std::vector<Metric> GetStatsForActivityAndMetric(MetricType metric_type,
+                                                   const base::Time& start,
+                                                   const base::Time& end) {
     return GetStatsForActivityAndMetric(kProcessChromeAggregate, metric_type,
                                         start, end);
   }
 
-  MetricInfoVector GetStatsForActivityAndMetric(const std::string& activity,
-                                                MetricType metric_type) {
+  std::vector<Metric> GetStatsForActivityAndMetric(const std::string& activity,
+                                                   MetricType metric_type) {
     return GetStatsForActivityAndMetric(activity, metric_type, base::Time(),
                                         clock_->GetTime());
   }
 
-  MetricInfoVector GetStatsForActivityAndMetric(MetricType metric_type) {
+  std::vector<Metric> GetStatsForActivityAndMetric(MetricType metric_type) {
     return GetStatsForActivityAndMetric(kProcessChromeAggregate, metric_type,
                                         base::Time(), clock_->GetTime());
   }