Fix CPM casting issue; refactor renderer crash events

chrome/browser/performance_monitor/key_builder.cc

Index: chrome/browser/performance_monitor/key_builder.cc
diff --git a/chrome/browser/performance_monitor/key_builder.cc b/chrome/browser/performance_monitor/key_builder.cc
index cfe0e299e0592bbd6b76c927ca51ca95e8ef1899..44eef3245cda0566e6eb66d1c1ee1c896169c85b 100644
--- a/chrome/browser/performance_monitor/key_builder.cc
+++ b/chrome/browser/performance_monitor/key_builder.cc
@@ -53,9 +53,9 @@ EVENT_EXTENSION_UPDATE_KEY_CHAR = 37,
 EVENT_EXTENSION_ENABLE_KEY_CHAR = 38,
 EVENT_EXTENSION_DISABLE_KEY_CHAR = 39,
 EVENT_CHROME_UPDATE_KEY_CHAR = 40,
-EVENT_RENDERER_FREEZE_KEY_CHAR = 41,
+EVENT_RENDERER_HANG_KEY_CHAR = 41,
 EVENT_RENDERER_CRASH_KEY_CHAR = 42,
-EVENT_KILLED_BY_OS_CRASH_KEY_CHAR = 43,
+EVENT_RENDERER_KILLED_KEY_CHAR = 43,
 EVENT_UNCLEAN_EXIT_KEY_CHAR = 44,
 EVENT_NUMBER_OF_EVENTS_KEY_CHAR = 255,
 };
@@ -127,12 +127,12 @@ void KeyBuilder::PopulateKeyMaps() {
       EVENT_EXTENSION_ENABLE_KEY_CHAR;
   event_type_to_event_key_char_[EVENT_EXTENSION_DISABLE] =
       EVENT_EXTENSION_DISABLE_KEY_CHAR;
-  event_type_to_event_key_char_[EVENT_RENDERER_FREEZE] =
-      EVENT_RENDERER_FREEZE_KEY_CHAR;
+  event_type_to_event_key_char_[EVENT_RENDERER_HANG] =
+      EVENT_RENDERER_HANG_KEY_CHAR;
   event_type_to_event_key_char_[EVENT_RENDERER_CRASH] =
       EVENT_RENDERER_CRASH_KEY_CHAR;
-  event_type_to_event_key_char_[EVENT_KILLED_BY_OS_CRASH] =
-      EVENT_KILLED_BY_OS_CRASH_KEY_CHAR;
+  event_type_to_event_key_char_[EVENT_RENDERER_KILLED] =
+      EVENT_RENDERER_KILLED_KEY_CHAR;
   event_type_to_event_key_char_[EVENT_UNCLEAN_EXIT] =
       EVENT_UNCLEAN_EXIT_KEY_CHAR;
   event_type_to_event_key_char_[EVENT_NUMBER_OF_EVENTS] =