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

Unified Diff: chrome/browser/extensions/extension_processes_apitest.cc

Issue 7520011: WebUI TaskManager: make it default on Chrome OS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 5 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
Index: chrome/browser/extensions/extension_processes_apitest.cc
diff --git a/chrome/browser/extensions/extension_processes_apitest.cc b/chrome/browser/extensions/extension_processes_apitest.cc
index b2a276a396a9bba6c6b036ca4b2b5d7d382046b9..ae86493ff13f1a3623d7de9f23aec658a1f97dd9 100644
--- a/chrome/browser/extensions/extension_processes_apitest.cc
+++ b/chrome/browser/extensions/extension_processes_apitest.cc
@@ -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 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ProcessesVsTaskManager) {
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_);

Powered by Google App Engine
This is Rietveld 408576698