Fix CPM casting issue; refactor renderer crash events

chrome/browser/performance_monitor/performance_monitor_browsertest.cc

Index: chrome/browser/performance_monitor/performance_monitor_browsertest.cc
diff --git a/chrome/browser/performance_monitor/performance_monitor_browsertest.cc b/chrome/browser/performance_monitor/performance_monitor_browsertest.cc
index 519e162259ea28dcbd1999cad368fadd62b901d9..dc2a1d033e9efc8aa997fdb36f502f786d0a37d7 100644
--- a/chrome/browser/performance_monitor/performance_monitor_browsertest.cc
+++ b/chrome/browser/performance_monitor/performance_monitor_browsertest.cc
@@ -597,13 +597,18 @@ IN_PROC_BROWSER_TEST_F(PerformanceMonitorBrowserTest, GatherStatistics) {
 // code in the testing environment, even if the process died (this is not the
 // case when hand-testing). This code can be traced to MSDN functions in
 // base::GetTerminationStatus(), so there's not much we can do.
-IN_PROC_BROWSER_TEST_F(PerformanceMonitorBrowserTest, KilledByOSEvent) {
+IN_PROC_BROWSER_TEST_F(PerformanceMonitorBrowserTest, RendererKilledEvent) {
   content::CrashTab(chrome::GetActiveWebContents(browser()));
 
   Database::EventVector events = GetEvents();
 
   ASSERT_EQ(1u, events.size());
-  CheckEventType(EVENT_KILLED_BY_OS_CRASH, events[0]);
+  CheckEventType(EVENT_RENDERER_KILLED, events[0]);
+
+  // Check the url - since we never went anywhere, this should be about:blank.
+  std::string url;
+  ASSERT_TRUE(events[0]->data()->GetString("url", &url));
+  ASSERT_EQ("about:blank", url);
 }
 #endif  // !defined(OS_WIN)
 
@@ -620,6 +625,10 @@ IN_PROC_BROWSER_TEST_F(PerformanceMonitorBrowserTest, RendererCrashEvent) {
   ASSERT_EQ(1u, events.size());
 
   CheckEventType(EVENT_RENDERER_CRASH, events[0]);
+
+  std::string url;
+  ASSERT_TRUE(events[0]->data()->GetString("url", &url));
+  ASSERT_EQ("chrome://crash/", url);
 }
 
 IN_PROC_BROWSER_TEST_F(PerformanceMonitorUncleanExitBrowserTest,