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

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"
@@ skipping 307 matching lines @@
   Database::MetricVectorMap metric_vector_map =
       db->GetStatsForMetricByActivity(metric_type, start, end);
 
   linked_ptr<Database::MetricVector> metric_vector =
       metric_vector_map[kProcessChromeAggregate];
 
   ConvertUnitsAndPopulateMetricResults(
       results,
       metric_type,
       db->GetMaxStatsForActivityAndMetric(metric_type),
-      AggregateMetric(metric_type,
-                      metric_vector.get(),
+      AggregateMetric(metric_vector.get(),
                       start,
                       resolution).get());
 }
 
 }  // namespace
 
 WebUIHandler::WebUIHandler() {
   // If we are not running the --run-performance-monitor flag, we will not have
   // started PerformanceMonitor.
   if (!PerformanceMonitor::initialized())
@@ skipping 117 matching lines @@
   util::PostTaskToDatabaseThreadAndReply(
       FROM_HERE,
       base::Bind(&DoGetMetric, results, metric_type,
                  start, end, resolution),
       base::Bind(&WebUIHandler::ReturnResults, AsWeakPtr(),
                  "PerformanceMonitor.getMetricCallback",
                  base::Owned(results)));
 }
 
 }  // namespace performance_monitor