Fix CPM casting issue; refactor renderer crash events

chrome/browser/ui/webui/performance_monitor/performance_monitor_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/performance_monitor_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/time.h"
 #include "base/values.h"
@@ skipping 46 matching lines @@
       event_set.insert(EVENT_EXTENSION_INSTALL);
       event_set.insert(EVENT_EXTENSION_UNINSTALL);
       event_set.insert(EVENT_EXTENSION_UPDATE);
       event_set.insert(EVENT_EXTENSION_ENABLE);
       event_set.insert(EVENT_EXTENSION_DISABLE);
       break;
     case EVENT_CATEGORY_CHROME:
       event_set.insert(EVENT_CHROME_UPDATE);
       break;
     case EVENT_CATEGORY_EXCEPTIONS:
-      event_set.insert(EVENT_RENDERER_FREEZE);
+      event_set.insert(EVENT_RENDERER_HANG);
       event_set.insert(EVENT_RENDERER_CRASH);
-      event_set.insert(EVENT_KILLED_BY_OS_CRASH);
+      event_set.insert(EVENT_RENDERER_KILLED);
       event_set.insert(EVENT_UNCLEAN_EXIT);
       break;
     default:
       NOTREACHED();
   }
   return event_set;
 }
 
 Unit GetUnitForMetricCategory(MetricCategory category) {
   switch (category) {
@@ skipping 378 matching lines @@
   util::PostTaskToDatabaseThreadAndReply(
       FROM_HERE,
       base::Bind(&DoGetMetric, results, metric_type,
                  start, end, resolution),
       base::Bind(&PerformanceMonitorHandler::ReturnResults, AsWeakPtr(),
                  "PerformanceMonitor.getMetricCallback",
                  base::Owned(results)));
 }
 
 }  // namespace performance_monitor