| 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 1026 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1037 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe())); | 1037 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe())); |
| 1038 | 1038 |
| 1039 HideTaskManager(); | 1039 HideTaskManager(); |
| 1040 ShowTaskManager(); | 1040 ShowTaskManager(); |
| 1041 | 1041 |
| 1042 ASSERT_NO_FATAL_FAILURE( | 1042 ASSERT_NO_FATAL_FAILURE( |
| 1043 WaitForTaskManagerRows(1, MatchTab("Title Of Awesomeness"))); | 1043 WaitForTaskManagerRows(1, MatchTab("Title Of Awesomeness"))); |
| 1044 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe())); | 1044 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe())); |
| 1045 } | 1045 } |
| 1046 | 1046 |
| 1047 IN_PROC_BROWSER_TEST_P(TaskManagerOOPIFBrowserTest, OrderingOfDependentRows) { | 1047 // Flaky on Linux http://crbug.com/700684 |
| 1048 #if defined(OS_LINUX) |
| 1049 #define MAYBE_OrderingOfDependentRows DISABLED_OrderingOfDependentRows |
| 1050 #else |
| 1051 #define MAYBE_OrderingOfDependentRows OrderingOfDependentRows |
| 1052 #endif |
| 1053 IN_PROC_BROWSER_TEST_P(TaskManagerOOPIFBrowserTest, |
| 1054 MAYBE_OrderingOfDependentRows) { |
| 1048 ShowTaskManager(); | 1055 ShowTaskManager(); |
| 1049 | 1056 |
| 1050 GURL a_with_frames(embedded_test_server()->GetURL( | 1057 GURL a_with_frames(embedded_test_server()->GetURL( |
| 1051 "a.com", "/cross_site_iframe_factory.html?a(b,b,c(d,a,b,c))")); | 1058 "a.com", "/cross_site_iframe_factory.html?a(b,b,c(d,a,b,c))")); |
| 1052 browser()->OpenURL(content::OpenURLParams(a_with_frames, content::Referrer(), | 1059 browser()->OpenURL(content::OpenURLParams(a_with_frames, content::Referrer(), |
| 1053 WindowOpenDisposition::CURRENT_TAB, | 1060 WindowOpenDisposition::CURRENT_TAB, |
| 1054 ui::PAGE_TRANSITION_TYPED, false)); | 1061 ui::PAGE_TRANSITION_TYPED, false)); |
| 1055 | 1062 |
| 1056 if (ShouldExpectSubframes()) { | 1063 if (ShouldExpectSubframes()) { |
| 1057 ASSERT_NO_FATAL_FAILURE( | 1064 ASSERT_NO_FATAL_FAILURE( |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1123 | 1130 |
| 1124 // Because the subframes for tab 2 are nested, their order is deterministic. | 1131 // Because the subframes for tab 2 are nested, their order is deterministic. |
| 1125 EXPECT_EQ("Subframe: http://a.com/", | 1132 EXPECT_EQ("Subframe: http://a.com/", |
| 1126 base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 1))); | 1133 base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 1))); |
| 1127 EXPECT_EQ("Subframe: http://c.com/", | 1134 EXPECT_EQ("Subframe: http://c.com/", |
| 1128 base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 2))); | 1135 base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 2))); |
| 1129 EXPECT_EQ("Subframe: http://b.com/", | 1136 EXPECT_EQ("Subframe: http://b.com/", |
| 1130 base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 3))); | 1137 base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 3))); |
| 1131 } | 1138 } |
| 1132 } | 1139 } |
| OLD | NEW |