From 41569a283de6a9694cd10f9187fd25e6d53066d4 Mon Sep 17 00:00:00 2001 From: "yoshiki@chromium.org" Date: Tue, 2 Aug 2011 00:43:41 +0000 Subject: 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 --- chrome/browser/prerender/prerender_browsertest.cc | 3 --- 1 file changed, 3 deletions(-) (limited to 'chrome/browser/prerender/prerender_browsertest.cc') diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc index 945fec3..2ea4ab0 100644 --- a/chrome/browser/prerender/prerender_browsertest.cc +++ b/chrome/browser/prerender/prerender_browsertest.cc @@ -19,7 +19,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/safe_browsing_service.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/browser/ui/tab_contents/tab_contents_wrapper.h" @@ -1054,8 +1053,6 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderTaskManager) { // Show the task manager. This populates the model. browser()->window()->ShowTaskManager(); - // Wait for the model of task manager to start. - TaskManagerBrowserTestUtil::WaitForResourceChange(2); // Start with two resources. PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); -- cgit v1.1