Merge 95567 - WebUI TaskManager: make it default on Chrome OS

chrome/browser/extensions/extension_processes_apitest.cc

Index: chrome/browser/extensions/extension_processes_apitest.cc
===================================================================
--- chrome/browser/extensions/extension_processes_apitest.cc	(revision 95775)
+++ chrome/browser/extensions/extension_processes_apitest.cc	(working copy)
@@ -6,6 +6,7 @@
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/task_manager/task_manager.h"
+#include "chrome/browser/task_manager/task_manager_browsertest_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_switches.h"
@@ -36,8 +37,9 @@
   EXPECT_EQ(1, model->update_requests_);
   EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_);
 
-  // Now show the task manager
-  browser()->window()->ShowTaskManager();
+  // Now show the task manager and wait for it to be ready
+  TaskManagerBrowserTestUtil::ShowTaskManagerAndWaitForReady(browser());
+
   EXPECT_EQ(2, model->update_requests_);
   EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_);