Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(191)

Side by Side Diff: chrome/browser/task_manager/task_manager_browsertest.cc

Issue 2298213003: Revert of Disable flaky TaskManagerBrowserTest.DevToolsNew{Und,D}ockedWindow tests (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 // TODO(crbug.com/642482): Disabled flaky test. 702 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DevToolsNewDockedWindow) {
703 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest,
704 DISABLED_DevToolsNewDockedWindow) {
705 ShowTaskManager(); // Task manager shown BEFORE dev tools window. 703 ShowTaskManager(); // Task manager shown BEFORE dev tools window.
706 704
707 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); 705 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
708 DevToolsWindow* devtools = 706 DevToolsWindow* devtools =
709 DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), true); 707 DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), true);
710 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab())); 708 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab()));
711 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab())); 709 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab()));
712 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools); 710 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools);
713 } 711 }
714 712
715 // TODO(crbug.com/642482): Disabled flaky test. 713 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DevToolsNewUndockedWindow) {
716 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest,
717 DISABLED_DevToolsNewUndockedWindow) {
718 ShowTaskManager(); // Task manager shown BEFORE dev tools window. 714 ShowTaskManager(); // Task manager shown BEFORE dev tools window.
719 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); 715 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab()));
720 DevToolsWindow* devtools = 716 DevToolsWindow* devtools =
721 DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), false); 717 DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), false);
722 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(3, MatchAnyTab())); 718 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(3, MatchAnyTab()));
723 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(3, MatchAnyTab())); 719 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(3, MatchAnyTab()));
724 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools); 720 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools);
725 } 721 }
726 722
727 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DevToolsOldDockedWindow) { 723 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DevToolsOldDockedWindow) {
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
1078 1074
1079 // Because the subframes for tab 2 are nested, their order is deterministic. 1075 // Because the subframes for tab 2 are nested, their order is deterministic.
1080 EXPECT_EQ("Subframe: http://a.com/", 1076 EXPECT_EQ("Subframe: http://a.com/",
1081 base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 1))); 1077 base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 1)));
1082 EXPECT_EQ("Subframe: http://c.com/", 1078 EXPECT_EQ("Subframe: http://c.com/",
1083 base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 2))); 1079 base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 2)));
1084 EXPECT_EQ("Subframe: http://b.com/", 1080 EXPECT_EQ("Subframe: http://b.com/",
1085 base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 3))); 1081 base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 3)));
1086 } 1082 }
1087 } 1083 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698