Fix CPM casting issue; refactor renderer crash events

chrome/browser/performance_monitor/events.json

Index: chrome/browser/performance_monitor/events.json
diff --git a/chrome/browser/performance_monitor/events.json b/chrome/browser/performance_monitor/events.json
index 9ac70f18c9cbc1c1d1e6ed01d678d6ec5e44a26f..f4eee49e87c3eae7d3d7c2c2d1cd95c3dbf1bb12 100644
--- a/chrome/browser/performance_monitor/events.json
+++ b/chrome/browser/performance_monitor/events.json
@@ -33,25 +33,15 @@
         }
       },
       {
-        "id": "RendererCrash",
+        "id": "RendererFailure",
         "type": "object",
-        "description": "The event to represent a renderer crash.",
+        "description": "The event to represent a renderer hanging, crashing, or being killed.",
         "properties": {
           "eventType": {"type": "integer", "description": "The type of the event."},
           "time": {"type": "number", "description": "The time at which the event was recorded."}
         }
       },
       {
-        "id": "RendererFreeze",
-        "type": "object",
-        "description": "The event to represent a frozen renderer (when the frozen tab popup comes up).",
-        "properties": {
-          "eventType": {"type": "integer", "description": "The type of the event."},
-          "time": {"type": "number", "description": "The time at which the event was recorded."},
-          "url": {"type": "string", "description": "The crash url."}
-        }
-      },
-      {
         "id": "UncleanExit",
         "type": "object",
         "description": "The event to represent an unclean exit.",