Add guards to metric values; erase bad events/metrics from db

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

Index: chrome/browser/ui/webui/performance_monitor/performance_monitor_ui_util_unittest.cc
diff --git a/chrome/browser/ui/webui/performance_monitor/performance_monitor_ui_util_unittest.cc b/chrome/browser/ui/webui/performance_monitor/performance_monitor_ui_util_unittest.cc
index d2d7f1705fadbc93348332b4211deea0622905d6..851c929d9a2b1536a57e627238eca77f28f0ad60 100644
--- a/chrome/browser/ui/webui/performance_monitor/performance_monitor_ui_util_unittest.cc
+++ b/chrome/browser/ui/webui/performance_monitor/performance_monitor_ui_util_unittest.cc
@@ -19,12 +19,12 @@ class PerformanceMonitorUtilTest : public ::testing::Test {
 TEST(PerformanceMonitorUtilTest, AggregateMetricEmptyTest) {
   Database::MetricVector metric;
   const base::Time data_time = base::Time::FromDoubleT(1);
-  metric.push_back(Metric(data_time, 1));
+  metric.push_back(Metric(METRIC_CPU_USAGE, data_time, 1));
 
   const base::Time results_time = base::Time::FromDoubleT(3);
   const base::TimeDelta resolution = base::TimeDelta::FromSeconds(1);
   scoped_ptr<Database::MetricVector> aggregated_metric =
-      AggregateMetric(&metric, results_time, resolution);
+      AggregateMetric(METRIC_CPU_USAGE, &metric, results_time, resolution);
   ASSERT_EQ(0u, aggregated_metric->size());
 }
 
@@ -35,9 +35,12 @@ TEST(PerformanceMonitorUtilTest, AggregateMetricSimpleTest) {
 
   const double value = 3.14;
   Database::MetricVector metric;
-  metric.push_back(Metric(data_time, value));
+  metric.push_back(Metric(METRIC_CPU_USAGE, data_time, value));
   scoped_ptr<Database::MetricVector> aggregated_metric =
-      AggregateMetric(&metric, results_time, results_resolution);
+      AggregateMetric(METRIC_CPU_USAGE,
+                      &metric,
+                      results_time,
+                      results_resolution);
 
   ASSERT_EQ(1u, aggregated_metric->size());
   ASSERT_EQ(results_time + results_resolution, aggregated_metric->at(0).time);
@@ -54,12 +57,17 @@ TEST(PerformanceMonitorUtilTest, AggregateMetricDenseTest) {
   Database::MetricVector metric;
 
   for (int i = 0; i < num_points; ++i) {
-    metric.push_back(Metric(current_data_time, current_value));
+    metric.push_back(Metric(METRIC_CPU_USAGE,
+                            current_data_time,
+                            current_value));
     current_value += 1;
     current_data_time += data_resolution;
   }
   scoped_ptr<Database::MetricVector> aggregated_metric =
-      AggregateMetric(&metric, results_time, results_resolution);
+      AggregateMetric(METRIC_CPU_USAGE,
+                      &metric,
+                      results_time,
+                      results_resolution);
   // The first 4 points get ignored because they are before the start time.
   // The remaining 8 points are aggregated into two data points.
   ASSERT_EQ(2u, aggregated_metric->size());
@@ -73,18 +81,21 @@ TEST(PerformanceMonitorUtilTest, AggregateMetricSparseTest) {
 
   const base::Time data_time1 = base::Time::FromDoubleT(20);
   const double value1 = 3.14;
-  metric.push_back(Metric(data_time1, value1));
+  metric.push_back(Metric(METRIC_CPU_USAGE, data_time1, value1));
   const base::Time data_time2 = base::Time::FromDoubleT(40);
   const double value2 = 6.28;
-  metric.push_back(Metric(data_time2, value2));
+  metric.push_back(Metric(METRIC_CPU_USAGE, data_time2, value2));
   const base::Time data_time3 = base::Time::FromDoubleT(60);
   const double value3 = 9.42;
-  metric.push_back(Metric(data_time3, value3));
+  metric.push_back(Metric(METRIC_CPU_USAGE, data_time3, value3));
 
   const base::Time results_time = base::Time::FromDoubleT(19);
   const base::TimeDelta results_resolution = base::TimeDelta::FromSeconds(2);
   scoped_ptr<Database::MetricVector> aggregated_metric =
-      AggregateMetric(&metric, results_time, results_resolution);
+      AggregateMetric(METRIC_CPU_USAGE,
+                      &metric,
+                      results_time,
+                      results_resolution);
 
   // The first aggregation point is split between the first value and the second
   // value. The second is split between the second and third. The third doesn't