Fix CPM casting issue; refactor renderer crash events

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

Index: chrome/browser/ui/webui/performance_monitor/performance_monitor_l10n.cc
diff --git a/chrome/browser/ui/webui/performance_monitor/performance_monitor_l10n.cc b/chrome/browser/ui/webui/performance_monitor/performance_monitor_l10n.cc
index 02cddbca45b76b058eb343aff3ae7ce73a03795e..f603d235fa253f7c187357999f8332e3b31b2644 100644
--- a/chrome/browser/ui/webui/performance_monitor/performance_monitor_l10n.cc
+++ b/chrome/browser/ui/webui/performance_monitor/performance_monitor_l10n.cc
@@ -76,14 +76,14 @@ string16 GetLocalizedStringFromEventType(const EventType type) {
     case EVENT_CHROME_UPDATE:
       string_id = IDS_PERFORMANCE_MONITOR_CHROME_UPDATE_EVENT;
       break;
-    case EVENT_RENDERER_FREEZE:
-      string_id = IDS_PERFORMANCE_MONITOR_RENDERER_FREEZE_EVENT;
+    case EVENT_RENDERER_HANG:
+      string_id = IDS_PERFORMANCE_MONITOR_RENDERER_HANG_EVENT;
       break;
     case EVENT_RENDERER_CRASH:
       string_id = IDS_PERFORMANCE_MONITOR_RENDERER_CRASH_EVENT;
       break;
-    case EVENT_KILLED_BY_OS_CRASH:
-      string_id = IDS_PERFORMANCE_MONITOR_KILLED_BY_OS_CRASH_EVENT;
+    case EVENT_RENDERER_KILLED:
+      string_id = IDS_PERFORMANCE_MONITOR_RENDERER_KILLED_EVENT;
       break;
     case EVENT_UNCLEAN_EXIT:
       string_id = IDS_PERFORMANCE_MONITOR_UNCLEAN_EXIT_EVENT;
@@ -120,15 +120,15 @@ string16 GetLocalizedStringForEventTypeDescription(const EventType type) {
       string_id1 = IDS_PERFORMANCE_MONITOR_CHROME_UPDATE_EVENT_DESCRIPTION;
       string_id2 = IDS_SHORT_PRODUCT_NAME;
       break;
-    case EVENT_RENDERER_FREEZE:
-      string_id1 = IDS_PERFORMANCE_MONITOR_RENDERER_FREEZE_EVENT_DESCRIPTION;
+    case EVENT_RENDERER_HANG:
+      string_id1 = IDS_PERFORMANCE_MONITOR_RENDERER_HANG_EVENT_DESCRIPTION;
       break;
     case EVENT_RENDERER_CRASH:
       string_id1 = IDS_PERFORMANCE_MONITOR_RENDERER_CRASH_EVENT_DESCRIPTION;
       string_id2 = IDS_SAD_TAB_TITLE;
       break;
-    case EVENT_KILLED_BY_OS_CRASH:
-      string_id1 = IDS_PERFORMANCE_MONITOR_KILLED_BY_OS_CRASH_EVENT_DESCRIPTION;
+    case EVENT_RENDERER_KILLED:
+      string_id1 = IDS_PERFORMANCE_MONITOR_RENDERER_KILLED_EVENT_DESCRIPTION;
       string_id2 = IDS_KILLED_TAB_TITLE;
       break;
     case EVENT_UNCLEAN_EXIT:
@@ -169,14 +169,14 @@ string16 GetLocalizedStringForEventTypeMouseover(const EventType type) {
     case EVENT_EXTENSION_DISABLE:
       string_id = IDS_PERFORMANCE_MONITOR_EXTENSION_DISABLE_EVENT_MOUSEOVER;
       break;
-    case EVENT_RENDERER_FREEZE:
-      string_id = IDS_PERFORMANCE_MONITOR_RENDERER_FREEZE_EVENT_MOUSEOVER;
+    case EVENT_RENDERER_HANG:
+      string_id = IDS_PERFORMANCE_MONITOR_RENDERER_HANG_EVENT_MOUSEOVER;
       break;
     case EVENT_RENDERER_CRASH:
       string_id = IDS_PERFORMANCE_MONITOR_RENDERER_CRASH_EVENT_MOUSEOVER;
       break;
-    case EVENT_KILLED_BY_OS_CRASH:
-      string_id = IDS_PERFORMANCE_MONITOR_KILLED_BY_OS_CRASH_EVENT_MOUSEOVER;
+    case EVENT_RENDERER_KILLED:
+      string_id = IDS_PERFORMANCE_MONITOR_RENDERER_KILLED_EVENT_MOUSEOVER;
       break;
     case EVENT_UNCLEAN_EXIT:
       string_id = IDS_PERFORMANCE_MONITOR_UNCLEAN_EXIT_EVENT_MOUSEOVER;