OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/files/file_path.h" | 6 #include "base/files/file_path.h" |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
10 #include "base/threading/sequenced_worker_pool.h" | 10 #include "base/threading/sequenced_worker_pool.h" |
(...skipping 605 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
616 ASSERT_TRUE(events[0]->data()->GetString("url", &url)); | 616 ASSERT_TRUE(events[0]->data()->GetString("url", &url)); |
617 ASSERT_EQ("about:blank", url); | 617 ASSERT_EQ("about:blank", url); |
618 } | 618 } |
619 #endif // !defined(OS_WIN) | 619 #endif // !defined(OS_WIN) |
620 | 620 |
621 IN_PROC_BROWSER_TEST_F(PerformanceMonitorBrowserTest, RendererCrashEvent) { | 621 IN_PROC_BROWSER_TEST_F(PerformanceMonitorBrowserTest, RendererCrashEvent) { |
622 content::WindowedNotificationObserver windowed_observer( | 622 content::WindowedNotificationObserver windowed_observer( |
623 content::NOTIFICATION_RENDERER_PROCESS_CLOSED, | 623 content::NOTIFICATION_RENDERER_PROCESS_CLOSED, |
624 content::NotificationService::AllSources()); | 624 content::NotificationService::AllSources()); |
625 | 625 |
626 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUICrashURL)); | 626 ui_test_utils::NavigateToURL(browser(), GURL(content::kChromeUICrashURL)); |
627 | 627 |
628 windowed_observer.Wait(); | 628 windowed_observer.Wait(); |
629 | 629 |
630 Database::EventVector events = GetEvents(); | 630 Database::EventVector events = GetEvents(); |
631 ASSERT_EQ(1u, events.size()); | 631 ASSERT_EQ(1u, events.size()); |
632 | 632 |
633 CheckEventType(EVENT_RENDERER_CRASH, events[0]); | 633 CheckEventType(EVENT_RENDERER_CRASH, events[0]); |
634 | 634 |
635 std::string url; | 635 std::string url; |
636 ASSERT_TRUE(events[0]->data()->GetString("url", &url)); | 636 ASSERT_TRUE(events[0]->data()->GetString("url", &url)); |
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
786 test_server()->GetURL(std::string("files/").append("title2.html"))); | 786 test_server()->GetURL(std::string("files/").append("title2.html"))); |
787 | 787 |
788 performance_monitor()->DoTimedCollections(); | 788 performance_monitor()->DoTimedCollections(); |
789 | 789 |
790 metrics = GetStats(METRIC_NETWORK_BYTES_READ); | 790 metrics = GetStats(METRIC_NETWORK_BYTES_READ); |
791 ASSERT_EQ(2u, metrics.size()); | 791 ASSERT_EQ(2u, metrics.size()); |
792 EXPECT_GE(metrics[1].value, page1_size + page2_size); | 792 EXPECT_GE(metrics[1].value, page1_size + page2_size); |
793 } | 793 } |
794 | 794 |
795 } // namespace performance_monitor | 795 } // namespace performance_monitor |
OLD | NEW |