Fix CPM casting issue; refactor renderer crash events

chrome/browser/performance_monitor/event.h

 // 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.
 
 #ifndef CHROME_BROWSER_PERFORMANCE_MONITOR_EVENT_H_
 #define CHROME_BROWSER_PERFORMANCE_MONITOR_EVENT_H_
 
 #include "base/values.h"
 #include "base/time.h"
 #include "base/memory/scoped_ptr.h"
 
 namespace performance_monitor {
 
 // IMPORTANT: To add new events, please
 // - Place the new event above EVENT_NUMBER_OF_EVENTS.
 // - Add a member to the EventKeyChar enum in key_builder.cc.
 // - Add the appropriate messages in generated_resources.grd.
 // - Add the appropriate functions in
 //   chrome/browser/ui/webui/performance_monitor/performance_monitor_l10n.h.
 enum EventType {
+  // Used only to indicate invalid events and to generate database keys.

[Yoyo Zhou, 2012/09/27 19:18:27]

I don't think this is needed.

[Devlin, 2012/09/28 02:33:23]

Done.

   EVENT_UNDEFINED,
+
+  // Extension-Related events
   EVENT_EXTENSION_INSTALL,
   EVENT_EXTENSION_UNINSTALL,
   EVENT_EXTENSION_UPDATE,
   EVENT_EXTENSION_ENABLE,
   EVENT_EXTENSION_DISABLE,
+
+  // Chrome's version has changed.
   EVENT_CHROME_UPDATE,
-  EVENT_RENDERER_FREEZE,
+
+  // Renderer-Failure related events; these correspond to the RENDERER_HANG
+  // event, and the two termination statuses ABNORMAL_EXIT and PROCESS_KILLED,
+  // respectively.
+  EVENT_RENDERER_HANG,
   EVENT_RENDERER_CRASH,
-  EVENT_KILLED_BY_OS_CRASH,
+  EVENT_RENDERER_KILLED,
+
+  // Chrome did not shut down correctly.
   EVENT_UNCLEAN_EXIT,
+
+  // Used only to indicate the number of events (including the undefined type)

[Yoyo Zhou, 2012/09/27 19:18:27]

I don't think you need this comment.

[Devlin, 2012/09/28 02:33:23]

Done.

+  // and to generate database keys.
   EVENT_NUMBER_OF_EVENTS
 };
 
 const char* EventTypeToString(EventType event_type);
 
 // The wrapper class for the JSON-generated event classes for the performance
 // monitor. This class is used so we can pass around events in a single class,
 // rather than having a variety of different types (since JSON does not
 // currently support inheritance). Since the class will occasionally need to
 // be compared against other events, we construct it with type and time. Other
@@ skipping 22 matching lines @@
   // The time at which the event was recorded.
   base::Time time_;
   // The full JSON-generated value representing the information of the event;
   // these data are described in chrome/browser/performance_monitor/events.json.
   scoped_ptr<base::DictionaryValue> data_;
 };
 
 }  // namespace performance_monitor
 
 #endif  // CHROME_BROWSER_PERFORMANCE_MONITOR_EVENT_H_