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 "chrome/browser/task_manager/task_manager.h" | 5 #include "chrome/browser/task_manager/task_manager.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
109 } | 109 } |
110 | 110 |
111 int FindResourceIndex(const base::string16& title) { | 111 int FindResourceIndex(const base::string16& title) { |
112 for (int i = 0; i < model_->GetRowCount(); ++i) { | 112 for (int i = 0; i < model_->GetRowCount(); ++i) { |
113 if (title == model_->GetRowTitle(i)) | 113 if (title == model_->GetRowTitle(i)) |
114 return i; | 114 return i; |
115 } | 115 } |
116 return -1; | 116 return -1; |
117 } | 117 } |
118 | 118 |
119 // TODO(nick, afakhry): Remove this function. https://crbug.com/606963 | |
120 void DisableNewTaskManagerForBrokenTest() { | |
121 base::CommandLine::ForCurrentProcess()->AppendSwitch( | |
122 switches::kDisableNewTaskManager); | |
123 } | |
124 | |
125 protected: | 119 protected: |
126 void SetUpCommandLine(base::CommandLine* command_line) override { | 120 void SetUpCommandLine(base::CommandLine* command_line) override { |
127 ExtensionBrowserTest::SetUpCommandLine(command_line); | 121 ExtensionBrowserTest::SetUpCommandLine(command_line); |
128 | 122 |
129 // Do not launch device discovery process. | 123 // Do not launch device discovery process. |
130 command_line->AppendSwitch(switches::kDisableDeviceDiscoveryNotifications); | 124 command_line->AppendSwitch(switches::kDisableDeviceDiscoveryNotifications); |
131 } | 125 } |
132 | 126 |
133 void TearDownOnMainThread() override { model_.reset(); } | 127 void TearDownOnMainThread() override { model_.reset(); } |
134 | 128 |
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
571 int extension_tab = FindResourceIndex(MatchExtension("Foobar")); | 565 int extension_tab = FindResourceIndex(MatchExtension("Foobar")); |
572 ASSERT_NE(-1, extension_tab); | 566 ASSERT_NE(-1, extension_tab); |
573 ASSERT_NE(-1, model()->GetTabId(extension_tab)); | 567 ASSERT_NE(-1, model()->GetTabId(extension_tab)); |
574 | 568 |
575 int background_page = FindResourceIndex(MatchExtension("My extension 1")); | 569 int background_page = FindResourceIndex(MatchExtension("My extension 1")); |
576 ASSERT_NE(-1, background_page); | 570 ASSERT_NE(-1, background_page); |
577 ASSERT_EQ(-1, model()->GetTabId(background_page)); | 571 ASSERT_EQ(-1, model()->GetTabId(background_page)); |
578 } | 572 } |
579 | 573 |
580 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeAppTabChanges) { | 574 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeAppTabChanges) { |
581 // TODO(nick, afakhry): Broken on new task manager because we show | |
582 // "Extension: Packaged App Test" instead of "App: Packaged App Test". | |
583 DisableNewTaskManagerForBrokenTest(); | |
584 | |
585 ShowTaskManager(); | 575 ShowTaskManager(); |
586 | 576 |
587 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("packaged_app"))); | 577 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("packaged_app"))); |
588 ExtensionService* service = extensions::ExtensionSystem::Get( | 578 ExtensionService* service = extensions::ExtensionSystem::Get( |
589 browser()->profile())->extension_service(); | 579 browser()->profile())->extension_service(); |
590 const extensions::Extension* extension = | 580 const extensions::Extension* extension = |
591 service->GetExtensionById(last_loaded_extension_id(), false); | 581 service->GetExtensionById(last_loaded_extension_id(), false); |
592 | 582 |
593 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab())); | 583 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab())); |
594 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); | 584 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); |
(...skipping 23 matching lines...) Expand all Loading... |
618 UnloadExtension(last_loaded_extension_id()); | 608 UnloadExtension(last_loaded_extension_id()); |
619 | 609 |
620 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); | 610 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); |
621 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnyApp())); | 611 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnyApp())); |
622 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnyExtension())); | 612 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnyExtension())); |
623 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab())); | 613 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab())); |
624 ASSERT_EQ(1, browser()->tab_strip_model()->count()); | 614 ASSERT_EQ(1, browser()->tab_strip_model()->count()); |
625 } | 615 } |
626 | 616 |
627 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeAppTab) { | 617 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeAppTab) { |
628 // TODO(nick, afakhry): Broken on new task manager because we show | |
629 // "Extension: Packaged App Test" instead of "App: Packaged App Test". | |
630 DisableNewTaskManagerForBrokenTest(); | |
631 | |
632 ASSERT_TRUE(LoadExtension( | 618 ASSERT_TRUE(LoadExtension( |
633 test_data_dir_.AppendASCII("packaged_app"))); | 619 test_data_dir_.AppendASCII("packaged_app"))); |
634 ExtensionService* service = extensions::ExtensionSystem::Get( | 620 ExtensionService* service = extensions::ExtensionSystem::Get( |
635 browser()->profile())->extension_service(); | 621 browser()->profile())->extension_service(); |
636 const extensions::Extension* extension = | 622 const extensions::Extension* extension = |
637 service->GetExtensionById(last_loaded_extension_id(), false); | 623 service->GetExtensionById(last_loaded_extension_id(), false); |
638 | 624 |
639 // Open a new tab to the app's launch URL and make sure we notice that. | 625 // Open a new tab to the app's launch URL and make sure we notice that. |
640 GURL url(extension->GetResourceURL("main.html")); | 626 GURL url(extension->GetResourceURL("main.html")); |
641 AddTabAtIndex(0, url, ui::PAGE_TRANSITION_TYPED); | 627 AddTabAtIndex(0, url, ui::PAGE_TRANSITION_TYPED); |
642 | 628 |
643 ShowTaskManager(); | 629 ShowTaskManager(); |
644 | 630 |
645 ASSERT_NO_FATAL_FAILURE( | 631 ASSERT_NO_FATAL_FAILURE( |
646 WaitForTaskManagerRows(1, MatchApp("Packaged App Test"))); | 632 WaitForTaskManagerRows(1, MatchApp("Packaged App Test"))); |
647 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); | 633 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); |
648 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnyExtension())); | 634 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnyExtension())); |
649 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyApp())); | 635 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyApp())); |
650 | 636 |
651 // Check that the third entry (main.html) is of type extension and has both | 637 // Check that the third entry (main.html) is of type extension and has both |
652 // a tab contents and an extension. | 638 // a tab contents and an extension. |
653 int app_tab = FindResourceIndex(MatchApp("Packaged App Test")); | 639 int app_tab = FindResourceIndex(MatchApp("Packaged App Test")); |
654 ASSERT_NE(-1, app_tab); | 640 ASSERT_NE(-1, app_tab); |
655 ASSERT_NE(-1, model()->GetTabId(app_tab)); | 641 ASSERT_NE(-1, model()->GetTabId(app_tab)); |
656 } | 642 } |
657 | 643 |
658 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeHostedAppTabChanges) { | 644 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeHostedAppTabChanges) { |
659 // TODO(nick, afakhry): Broken on new task manager because we show | |
660 // "Tab: Unmodified" instead of "App: ". | |
661 DisableNewTaskManagerForBrokenTest(); | |
662 | |
663 ShowTaskManager(); | 645 ShowTaskManager(); |
664 | 646 |
665 // The app under test acts on URLs whose host is "localhost", | 647 // The app under test acts on URLs whose host is "localhost", |
666 // so the URLs we navigate to must have host "localhost". | 648 // so the URLs we navigate to must have host "localhost". |
667 host_resolver()->AddRule("*", "127.0.0.1"); | 649 host_resolver()->AddRule("*", "127.0.0.1"); |
668 ASSERT_TRUE(embedded_test_server()->Start()); | 650 ASSERT_TRUE(embedded_test_server()->Start()); |
669 GURL::Replacements replace_host; | 651 GURL::Replacements replace_host; |
670 replace_host.SetHostStr("localhost"); | 652 replace_host.SetHostStr("localhost"); |
671 GURL base_url = embedded_test_server()->GetURL( | 653 GURL base_url = embedded_test_server()->GetURL( |
672 "/extensions/api_test/app_process/"); | 654 "/extensions/api_test/app_process/"); |
(...skipping 24 matching lines...) Expand all Loading... |
697 // Now reload and check that the last entry's title now starts with "App:". | 679 // Now reload and check that the last entry's title now starts with "App:". |
698 ui_test_utils::NavigateToURL(browser(), url); | 680 ui_test_utils::NavigateToURL(browser(), url); |
699 | 681 |
700 // Force the TaskManager to query the title. | 682 // Force the TaskManager to query the title. |
701 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); | 683 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); |
702 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab())); | 684 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab())); |
703 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyApp())); | 685 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyApp())); |
704 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchApp("Unmodified"))); | 686 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchApp("Unmodified"))); |
705 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnyExtension())); | 687 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnyExtension())); |
706 | 688 |
707 // Disable extension. | 689 // Disable extension and reload. |
708 DisableExtension(last_loaded_extension_id()); | 690 DisableExtension(last_loaded_extension_id()); |
| 691 ui_test_utils::NavigateToURL(browser(), url); |
709 | 692 |
710 // The hosted app should now show up as a normal "Tab: ". | 693 // The hosted app should now show up as a normal "Tab: ". |
711 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab())); | 694 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab())); |
712 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab())); | 695 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab())); |
713 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("Unmodified"))); | 696 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("Unmodified"))); |
714 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnyExtension())); | |
715 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnyApp())); | |
716 | |
717 // Reload the page. | |
718 ui_test_utils::NavigateToURL(browser(), url); | |
719 | |
720 // No change expected. | |
721 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab())); | |
722 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAboutBlankTab())); | |
723 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchTab("Unmodified"))); | |
724 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnyExtension())); | 697 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnyExtension())); |
725 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnyApp())); | 698 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnyApp())); |
726 } | 699 } |
727 | 700 |
728 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeHostedAppTabAfterReload) { | 701 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeHostedAppTabAfterReload) { |
729 // TODO(nick, afakhry): This fails on the new task manager (we never | |
730 // reclassify the tab as an app). Remove when fixed. | |
731 DisableNewTaskManagerForBrokenTest(); | |
732 | |
733 // The app under test acts on URLs whose host is "localhost", | 702 // The app under test acts on URLs whose host is "localhost", |
734 // so the URLs we navigate to must have host "localhost". | 703 // so the URLs we navigate to must have host "localhost". |
735 host_resolver()->AddRule("*", "127.0.0.1"); | 704 host_resolver()->AddRule("*", "127.0.0.1"); |
736 ASSERT_TRUE(embedded_test_server()->Start()); | 705 ASSERT_TRUE(embedded_test_server()->Start()); |
737 GURL::Replacements replace_host; | 706 GURL::Replacements replace_host; |
738 replace_host.SetHostStr("localhost"); | 707 replace_host.SetHostStr("localhost"); |
739 GURL base_url = | 708 GURL base_url = |
740 embedded_test_server()->GetURL("/extensions/api_test/app_process/"); | 709 embedded_test_server()->GetURL("/extensions/api_test/app_process/"); |
741 base_url = base_url.ReplaceComponents(replace_host); | 710 base_url = base_url.ReplaceComponents(replace_host); |
742 | 711 |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
901 minimal_heap_size)); | 870 minimal_heap_size)); |
902 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerStatToExceed( | 871 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerStatToExceed( |
903 MatchUtility(proxy_resolver_name), ColumnSpecifier::V8_MEMORY_USED, | 872 MatchUtility(proxy_resolver_name), ColumnSpecifier::V8_MEMORY_USED, |
904 minimal_heap_size)); | 873 minimal_heap_size)); |
905 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyUtility())); | 874 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyUtility())); |
906 ASSERT_NO_FATAL_FAILURE( | 875 ASSERT_NO_FATAL_FAILURE( |
907 WaitForTaskManagerRows(1, MatchUtility(proxy_resolver_name))); | 876 WaitForTaskManagerRows(1, MatchUtility(proxy_resolver_name))); |
908 } | 877 } |
909 | 878 |
910 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DevToolsNewDockedWindow) { | 879 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DevToolsNewDockedWindow) { |
911 // TODO(nick, afakhry): Broken on new task manager because we show | |
912 // a long chrome-devtools:// URL without a prefix (expecting "Tab: *"). | |
913 DisableNewTaskManagerForBrokenTest(); | |
914 | |
915 ShowTaskManager(); // Task manager shown BEFORE dev tools window. | 880 ShowTaskManager(); // Task manager shown BEFORE dev tools window. |
916 | 881 |
917 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); | 882 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); |
918 DevToolsWindow* devtools = | 883 DevToolsWindow* devtools = |
919 DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), true); | 884 DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), true); |
920 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab())); | 885 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab())); |
921 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab())); | 886 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab())); |
922 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools); | 887 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools); |
923 } | 888 } |
924 | 889 |
925 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DevToolsNewUndockedWindow) { | 890 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DevToolsNewUndockedWindow) { |
926 // TODO(nick, afakhry): Broken on new task manager because we show | |
927 // a long chrome-devtools:// URL without a prefix (expecting "Tab: *"). | |
928 DisableNewTaskManagerForBrokenTest(); | |
929 | |
930 ShowTaskManager(); // Task manager shown BEFORE dev tools window. | 891 ShowTaskManager(); // Task manager shown BEFORE dev tools window. |
931 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); | 892 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(1, MatchAnyTab())); |
932 DevToolsWindow* devtools = | 893 DevToolsWindow* devtools = |
933 DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), false); | 894 DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), false); |
934 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(3, MatchAnyTab())); | 895 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(3, MatchAnyTab())); |
935 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(3, MatchAnyTab())); | 896 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(3, MatchAnyTab())); |
936 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools); | 897 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools); |
937 } | 898 } |
938 | 899 |
939 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DevToolsOldDockedWindow) { | 900 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DevToolsOldDockedWindow) { |
940 // TODO(nick, afakhry): Broken on new task manager because we show | |
941 // a long chrome-devtools:// URL without a prefix (expecting "Tab: *"). | |
942 DisableNewTaskManagerForBrokenTest(); | |
943 | |
944 DevToolsWindow* devtools = | 901 DevToolsWindow* devtools = |
945 DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), true); | 902 DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), true); |
946 ShowTaskManager(); // Task manager shown AFTER dev tools window. | 903 ShowTaskManager(); // Task manager shown AFTER dev tools window. |
947 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab())); | 904 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab())); |
948 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab())); | 905 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(2, MatchAnyTab())); |
949 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools); | 906 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools); |
950 } | 907 } |
951 | 908 |
952 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DevToolsOldUndockedWindow) { | 909 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DevToolsOldUndockedWindow) { |
953 // TODO(nick, afakhry): Broken on new task manager because we show | |
954 // a long chrome-devtools:// URL without a prefix (expecting "Tab: *"). | |
955 DisableNewTaskManagerForBrokenTest(); | |
956 | |
957 DevToolsWindow* devtools = | 910 DevToolsWindow* devtools = |
958 DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), false); | 911 DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), false); |
959 ShowTaskManager(); // Task manager shown AFTER dev tools window. | 912 ShowTaskManager(); // Task manager shown AFTER dev tools window. |
960 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(3, MatchAnyTab())); | 913 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(3, MatchAnyTab())); |
961 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(3, MatchAnyTab())); | 914 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(3, MatchAnyTab())); |
962 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools); | 915 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools); |
963 } | 916 } |
964 | 917 |
965 IN_PROC_BROWSER_TEST_P(TaskManagerOOPIFBrowserTest, KillSubframe) { | 918 IN_PROC_BROWSER_TEST_P(TaskManagerOOPIFBrowserTest, KillSubframe) { |
966 ShowTaskManager(); | 919 ShowTaskManager(); |
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1232 WaitForTaskManagerRows(1, MatchTab("Title Of Awesomeness"))); | 1185 WaitForTaskManagerRows(1, MatchTab("Title Of Awesomeness"))); |
1233 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe())); | 1186 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe())); |
1234 | 1187 |
1235 HideTaskManager(); | 1188 HideTaskManager(); |
1236 ShowTaskManager(); | 1189 ShowTaskManager(); |
1237 | 1190 |
1238 ASSERT_NO_FATAL_FAILURE( | 1191 ASSERT_NO_FATAL_FAILURE( |
1239 WaitForTaskManagerRows(1, MatchTab("Title Of Awesomeness"))); | 1192 WaitForTaskManagerRows(1, MatchTab("Title Of Awesomeness"))); |
1240 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe())); | 1193 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe())); |
1241 } | 1194 } |
OLD | NEW |