Fix CPM casting issue; refactor renderer crash events

chrome/browser/performance_monitor/performance_monitor_browsertest.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 "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
@@ skipping 579 matching lines @@
   stats = GetStats(METRIC_SHARED_MEMORY_USAGE);
   ASSERT_EQ(2u, stats.size());
   EXPECT_GT(stats[1].value, 0);
 }
 
 #if !defined(OS_WIN)
 // Disabled on Windows due to a bug where Windows will return a normal exit
 // 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)
 
 IN_PROC_BROWSER_TEST_F(PerformanceMonitorBrowserTest, RendererCrashEvent) {
   content::WindowedNotificationObserver windowed_observer(
       content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
       content::NotificationService::AllSources());
 
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUICrashURL));
 
   windowed_observer.Wait();
 
   Database::EventVector events = GetEvents();
   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,
                        OneProfileUncleanExit) {
   // Initialize the database value (if there's no value in the database, it
   // can't determine the last active time of the profile, and doesn't insert
   // the event).
   const std::string time = "12985807272597591";
   AddStateValue(kStateProfilePrefix + first_profile_name_, time);
 
@@ skipping 128 matching lines @@
       test_server()->GetURL(std::string("files/").append("title2.html")));
 
   performance_monitor()->DoTimedCollections();
 
   metrics = GetStats(METRIC_NETWORK_BYTES_READ);
   ASSERT_EQ(2u, metrics.size());
   EXPECT_GE(metrics[1].value, page1_size + page2_size);
 }
 
 }  // namespace performance_monitor