diff options
| author | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-02 00:43:41 +0000 |
|---|---|---|
| committer | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-02 00:43:41 +0000 |
| commit | 41569a283de6a9694cd10f9187fd25e6d53066d4 (patch) | |
| tree | 6a9e2ce1562a506db23d2f37957ad98889e8b07c /chrome/browser/extensions | |
| parent | b7fcc70c33e49b64053b2c0a7aad57a8d01746ff (diff) | |
| download | chromium_src-41569a283de6a9694cd10f9187fd25e6d53066d4.zip chromium_src-41569a283de6a9694cd10f9187fd25e6d53066d4.tar.gz chromium_src-41569a283de6a9694cd10f9187fd25e6d53066d4.tar.bz2 | |
Revert 95015 - WebUI TaskManager: make it default on Chrome OS
And fixes the code of task manager and following tests which didn't work correctly on WebUI TaskManager.
- TaskManagerBrowserTest.ShutdownWhileOpen
- ExtensionApiTest.ProcessesVsTaskManager
- PrerenderBrowserTest.PrerenderTaskManager
BUG=chromium-os:13885
TEST=trybots
Review URL: http://codereview.chromium.org/7520011
TBR=yoshiki@chromium.org
Review URL: http://codereview.chromium.org/7537045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95018 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
| -rw-r--r-- | chrome/browser/extensions/extension_processes_apitest.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/extensions/extension_processes_apitest.cc b/chrome/browser/extensions/extension_processes_apitest.cc index ae86493..b2a276a 100644 --- a/chrome/browser/extensions/extension_processes_apitest.cc +++ b/chrome/browser/extensions/extension_processes_apitest.cc @@ -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 @@ 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 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_); |