| 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 681 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 692 MatchUtility(proxy_resolver_name), ColumnSpecifier::V8_MEMORY, | 692 MatchUtility(proxy_resolver_name), ColumnSpecifier::V8_MEMORY, |
| 693 minimal_heap_size)); | 693 minimal_heap_size)); |
| 694 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerStatToExceed( | 694 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerStatToExceed( |
| 695 MatchUtility(proxy_resolver_name), ColumnSpecifier::V8_MEMORY_USED, | 695 MatchUtility(proxy_resolver_name), ColumnSpecifier::V8_MEMORY_USED, |
| 696 minimal_heap_size)); | 696 minimal_heap_size)); |
| 697 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyUtility())); | 697 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyUtility())); |
| 698 ASSERT_NO_FATAL_FAILURE( | 698 ASSERT_NO_FATAL_FAILURE( |
| 699 WaitForTaskManagerRows(1, MatchUtility(proxy_resolver_name))); | 699 WaitForTaskManagerRows(1, MatchUtility(proxy_resolver_name))); |
| 700 } | 700 } |
| 701 | 701 |
| 702 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DevToolsNewDockedWindow) { | 702 // TODO(crbug.com/642482): Disabled flaky test. |
| 703 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, |
| 704 DISABLED_DevToolsNewDockedWindow) { |
| 703 ShowTaskManager(); // Task manager shown BEFORE dev tools window. | 705 ShowTaskManager(); // Task manager shown BEFORE dev tools window. |
| 704 | 706 |
| 705 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); | 707 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); |
| 706 DevToolsWindow* devtools = | 708 DevToolsWindow* devtools = |
| 707 DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), true); | 709 DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), true); |
| 708 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab())); | 710 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab())); |
| 709 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab())); | 711 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab())); |
| 710 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools); | 712 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools); |
| 711 } | 713 } |
| 712 | 714 |
| 713 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DevToolsNewUndockedWindow) { | 715 // TODO(crbug.com/642482): Disabled flaky test. |
| 716 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, |
| 717 DISABLED_DevToolsNewUndockedWindow) { |
| 714 ShowTaskManager(); // Task manager shown BEFORE dev tools window. | 718 ShowTaskManager(); // Task manager shown BEFORE dev tools window. |
| 715 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); | 719 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); |
| 716 DevToolsWindow* devtools = | 720 DevToolsWindow* devtools = |
| 717 DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), false); | 721 DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), false); |
| 718 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(3, MatchAnyTab())); | 722 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(3, MatchAnyTab())); |
| 719 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(3, MatchAnyTab())); | 723 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(3, MatchAnyTab())); |
| 720 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools); | 724 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools); |
| 721 } | 725 } |
| 722 | 726 |
| 723 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DevToolsOldDockedWindow) { | 727 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DevToolsOldDockedWindow) { |
| (...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1074 | 1078 |
| 1075 // Because the subframes for tab 2 are nested, their order is deterministic. | 1079 // Because the subframes for tab 2 are nested, their order is deterministic. |
| 1076 EXPECT_EQ("Subframe: http://a.com/", | 1080 EXPECT_EQ("Subframe: http://a.com/", |
| 1077 base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 1))); | 1081 base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 1))); |
| 1078 EXPECT_EQ("Subframe: http://c.com/", | 1082 EXPECT_EQ("Subframe: http://c.com/", |
| 1079 base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 2))); | 1083 base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 2))); |
| 1080 EXPECT_EQ("Subframe: http://b.com/", | 1084 EXPECT_EQ("Subframe: http://b.com/", |
| 1081 base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 3))); | 1085 base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 3))); |
| 1082 } | 1086 } |
| 1083 } | 1087 } |
| OLD | NEW |