Fix CPM casting issue; refactor renderer crash events

chrome/browser/performance_monitor/key_builder.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/performance_monitor/key_builder.h"
 
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
@@ skipping 35 matching lines @@
 };
 
 enum EventKeyChar {
 EVENT_UNDEFINED_KEY_CHAR = 34,
 EVENT_EXTENSION_INSTALL_KEY_CHAR = 35,
 EVENT_EXTENSION_UNINSTALL_KEY_CHAR = 36,
 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,
 };
 
 // The position of different elements in the key for the event db.
 enum EventKeyPosition {
   EVENT_TIME,  // The time the event was generated.
   EVENT_TYPE  // The type of event.
 };
 
@@ skipping 51 matching lines @@
   event_type_to_event_key_char_[EVENT_EXTENSION_INSTALL] =
       EVENT_EXTENSION_INSTALL_KEY_CHAR;
   event_type_to_event_key_char_[EVENT_EXTENSION_UNINSTALL] =
       EVENT_EXTENSION_UNINSTALL_KEY_CHAR;
   event_type_to_event_key_char_[EVENT_EXTENSION_UPDATE] =
       EVENT_EXTENSION_UPDATE_KEY_CHAR;
   event_type_to_event_key_char_[EVENT_EXTENSION_ENABLE] =
       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] =
       EVENT_NUMBER_OF_EVENTS_KEY_CHAR;
   DCHECK(event_type_to_event_key_char_.size() == EVENT_NUMBER_OF_EVENTS);
 
   // Generate the reverse map for easy look-up between event character mappings
   // and event types.
   for (int i = static_cast<int>(EVENT_UNDEFINED);
        i <= static_cast<int>(EVENT_NUMBER_OF_EVENTS); ++i) {
@@ skipping 92 matching lines @@
   std::vector<std::string> split;
   base::SplitString(key, kDelimiter, &split);
   DCHECK(split[METRIC_TYPE].size() == 1);
   return MetricKey(split[METRIC_TIME],
                    metric_key_char_to_metric_type_[
                        static_cast<int>(split[METRIC_TYPE].at(0))],
                    split[METRIC_ACTIVITY]);
 }
 
 }  // namespace performance_monitor