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

chrome/browser/extensions/extension_processes_apitest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #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"
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Processes) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableExperimentalExtensionApis);
 
   ASSERT_TRUE(RunExtensionTest("processes/api")) << message_;
 }
@@ skipping 10 matching lines @@
   // Load extension that adds listener in background page
   ExtensionTestMessageListener listener("ready", false);
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("processes").AppendASCII("onupdated")));
   ASSERT_TRUE(listener.WaitUntilSatisfied());
 
   // Ensure the task manager has started updating
   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_);
 
   // Unload the extension and check that listener count decreases
   UnloadExtension(last_loaded_extension_id_);
   EXPECT_EQ(1, model->update_requests_);
 }