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

Unified Diff: chrome/browser/task_manager/task_manager_browsertest.cc

Issue 8221018: WebUI TaskManager: Turn it on-by-default on Win/Mac/Linux (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: review fix Created 9 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/task_manager/task_manager_browsertest.cc
diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc
index fa9369ae71c00d60ce2d4b158f2191aa8990bbfa..f45beb7a412813e4dd5033823f7a1c5ff01ec7b0 100644
--- a/chrome/browser/task_manager/task_manager_browsertest.cc
+++ b/chrome/browser/task_manager/task_manager_browsertest.cc
@@ -207,6 +207,8 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeExtensionTabs) {
// Show the task manager. This populates the model, and helps with debugging
// (you see the task manager).
browser()->window()->ShowTaskManager();
+ // Wait for loading of task manager.
+ TaskManagerBrowserTestUtil::WaitForResourceChange(2);
ASSERT_TRUE(LoadExtension(
test_data_dir_.AppendASCII("good").AppendASCII("Extensions")
@@ -246,6 +248,8 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeAppTabs) {
// Show the task manager. This populates the model, and helps with debugging
// (you see the task manager).
browser()->window()->ShowTaskManager();
+ // Wait for loading of task manager.
+ TaskManagerBrowserTestUtil::WaitForResourceChange(2);
ASSERT_TRUE(LoadExtension(
test_data_dir_.AppendASCII("packaged_app")));
@@ -330,6 +334,8 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, MAYBE_KillExtension) {
// Show the task manager. This populates the model, and helps with debugging
// (you see the task manager).
browser()->window()->ShowTaskManager();
+ // Wait for loading of task manager.
+ TaskManagerBrowserTestUtil::WaitForResourceChange(2);
ASSERT_TRUE(LoadExtension(
test_data_dir_.AppendASCII("common").AppendASCII("background_page")));
@@ -355,6 +361,8 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest,
// Show the task manager. This populates the model, and helps with debugging
// (you see the task manager).
browser()->window()->ShowTaskManager();
+ // Wait for loading of task manager.
+ TaskManagerBrowserTestUtil::WaitForResourceChange(2);
ASSERT_TRUE(LoadExtension(
test_data_dir_.AppendASCII("common").AppendASCII("background_page")));
@@ -396,6 +404,8 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, MAYBE_ReloadExtension) {
// Show the task manager. This populates the model, and helps with debugging
// (you see the task manager).
browser()->window()->ShowTaskManager();
+ // Wait for loading of task manager.
+ TaskManagerBrowserTestUtil::WaitForResourceChange(2);
LOG(INFO) << "loading extension";
ASSERT_TRUE(LoadExtension(
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698