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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 7537045: Revert 95015 - 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
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/prerender/prerender_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_processes_apitest.cc
===================================================================
--- chrome/browser/extensions/extension_processes_apitest.cc (revision 95017)
+++ chrome/browser/extensions/extension_processes_apitest.cc (working copy)
@@ -6,7 +6,6 @@
#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"
@@ -37,9 +36,8 @@
EXPECT_EQ(1, model->update_requests_);
EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_);
- // Now show the task manager and wait for it to be ready
- TaskManagerBrowserTestUtil::ShowTaskManagerAndWaitForReady(browser());
-
+ // Now show the task manager
+ browser()->window()->ShowTaskManager();
EXPECT_EQ(2, model->update_requests_);
EXPECT_EQ(TaskManagerModel::TASK_PENDING, model->update_state_);
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/prerender/prerender_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698