| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 <stddef.h> | 5 #include <stddef.h> |
| 6 #include <vector> | 6 #include <vector> |
| 7 | 7 |
| 8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 844 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 855 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerStatToExceed( | 855 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerStatToExceed( |
| 856 MatchTab("title1.html"), ColumnSpecifier::V8_MEMORY, minimal_heap_size)); | 856 MatchTab("title1.html"), ColumnSpecifier::V8_MEMORY, minimal_heap_size)); |
| 857 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerStatToExceed( | 857 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerStatToExceed( |
| 858 MatchTab("title1.html"), ColumnSpecifier::V8_MEMORY_USED, | 858 MatchTab("title1.html"), ColumnSpecifier::V8_MEMORY_USED, |
| 859 minimal_heap_size)); | 859 minimal_heap_size)); |
| 860 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); | 860 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); |
| 861 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("title1.html"))); | 861 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("title1.html"))); |
| 862 } | 862 } |
| 863 | 863 |
| 864 // Checks that task manager counts idle wakeups. | 864 // Checks that task manager counts idle wakeups. |
| 865 // Flakily fails on Mac: http://crbug.com/639939 |
| 866 #if defined(OS_MACOSX) |
| 867 #define MAYBE_IdleWakeups DISABLED_IdleWakeups |
| 868 #else |
| 869 #define MAYBE_IdleWakeups IdleWakeups |
| 870 #endif // defined(OS_MACOSX) |
| 865 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, | 871 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, |
| 866 IdleWakeups) { | 872 MAYBE_IdleWakeups) { |
| 867 ShowTaskManager(); | 873 ShowTaskManager(); |
| 868 model()->ToggleColumnVisibility(ColumnSpecifier::IDLE_WAKEUPS); | 874 model()->ToggleColumnVisibility(ColumnSpecifier::IDLE_WAKEUPS); |
| 869 | 875 |
| 870 ui_test_utils::NavigateToURL(browser(), GetTestURL()); | 876 ui_test_utils::NavigateToURL(browser(), GetTestURL()); |
| 871 | 877 |
| 872 std::string test_js = | 878 std::string test_js = |
| 873 "function myWait() {\n" | 879 "function myWait() {\n" |
| 874 " setTimeout(function() { myWait(); }, 1)\n" | 880 " setTimeout(function() { myWait(); }, 1)\n" |
| 875 "}\n" | 881 "}\n" |
| 876 "myWait();\n" | 882 "myWait();\n" |
| (...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1286 | 1292 |
| 1287 // Because the subframes for tab 2 are nested, their order is deterministic. | 1293 // Because the subframes for tab 2 are nested, their order is deterministic. |
| 1288 EXPECT_EQ("Subframe: http://a.com/", | 1294 EXPECT_EQ("Subframe: http://a.com/", |
| 1289 base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 1))); | 1295 base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 1))); |
| 1290 EXPECT_EQ("Subframe: http://c.com/", | 1296 EXPECT_EQ("Subframe: http://c.com/", |
| 1291 base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 2))); | 1297 base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 2))); |
| 1292 EXPECT_EQ("Subframe: http://b.com/", | 1298 EXPECT_EQ("Subframe: http://b.com/", |
| 1293 base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 3))); | 1299 base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 3))); |
| 1294 } | 1300 } |
| 1295 } | 1301 } |
| OLD | NEW |