| 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/file_path.h" | 6 #include "base/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/string_number_conversions.h" | 9 #include "base/string_number_conversions.h" |
| 10 #include "base/threading/sequenced_worker_pool.h" | 10 #include "base/threading/sequenced_worker_pool.h" |
| (...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 545 std::string previous_version; | 545 std::string previous_version; |
| 546 std::string current_version; | 546 std::string current_version; |
| 547 | 547 |
| 548 ASSERT_TRUE(value->GetString("previousVersion", &previous_version)); | 548 ASSERT_TRUE(value->GetString("previousVersion", &previous_version)); |
| 549 ASSERT_EQ(kOldVersion, previous_version); | 549 ASSERT_EQ(kOldVersion, previous_version); |
| 550 ASSERT_TRUE(value->GetString("currentVersion", ¤t_version)); | 550 ASSERT_TRUE(value->GetString("currentVersion", ¤t_version)); |
| 551 ASSERT_EQ(version_string, current_version); | 551 ASSERT_EQ(version_string, current_version); |
| 552 } | 552 } |
| 553 | 553 |
| 554 // crbug.com/160502 | 554 // crbug.com/160502 |
| 555 IN_PROC_BROWSER_TEST_F(PerformanceMonitorBrowserTest, FLAKY_GatherStatistics) { | 555 IN_PROC_BROWSER_TEST_F(PerformanceMonitorBrowserTest, |
| 556 DISABLED_GatherStatistics) { |
| 556 GatherStatistics(); | 557 GatherStatistics(); |
| 557 | 558 |
| 558 // No stats should be recorded for this CPUUsage because this was the first | 559 // No stats should be recorded for this CPUUsage because this was the first |
| 559 // call to GatherStatistics. | 560 // call to GatherStatistics. |
| 560 Database::MetricVector stats = GetStats(METRIC_CPU_USAGE); | 561 Database::MetricVector stats = GetStats(METRIC_CPU_USAGE); |
| 561 ASSERT_EQ(0u, stats.size()); | 562 ASSERT_EQ(0u, stats.size()); |
| 562 | 563 |
| 563 stats = GetStats(METRIC_PRIVATE_MEMORY_USAGE); | 564 stats = GetStats(METRIC_PRIVATE_MEMORY_USAGE); |
| 564 ASSERT_EQ(1u, stats.size()); | 565 ASSERT_EQ(1u, stats.size()); |
| 565 EXPECT_GT(stats[0].value, 0); | 566 EXPECT_GT(stats[0].value, 0); |
| (...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 784 test_server()->GetURL(std::string("files/").append("title2.html"))); | 785 test_server()->GetURL(std::string("files/").append("title2.html"))); |
| 785 | 786 |
| 786 performance_monitor()->DoTimedCollections(); | 787 performance_monitor()->DoTimedCollections(); |
| 787 | 788 |
| 788 metrics = GetStats(METRIC_NETWORK_BYTES_READ); | 789 metrics = GetStats(METRIC_NETWORK_BYTES_READ); |
| 789 ASSERT_EQ(2u, metrics.size()); | 790 ASSERT_EQ(2u, metrics.size()); |
| 790 EXPECT_GE(metrics[1].value, page1_size + page2_size); | 791 EXPECT_GE(metrics[1].value, page1_size + page2_size); |
| 791 } | 792 } |
| 792 | 793 |
| 793 } // namespace performance_monitor | 794 } // namespace performance_monitor |
| OLD | NEW |