summaryrefslogtreecommitdiffstats
path: root/chrome/browser/task_manager
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-07 08:03:02 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-07 08:03:02 +0000
commit96fd3a384522160ea9d11cd9bad573576ca10d06 (patch)
tree327bfddc95970a631c4395f55f9668c5717d686f /chrome/browser/task_manager
parent822b6ed73a7fabf3195a7fb81c4903da8c7e395f (diff)
downloadchromium_src-96fd3a384522160ea9d11cd9bad573576ca10d06.zip
chromium_src-96fd3a384522160ea9d11cd9bad573576ca10d06.tar.gz
chromium_src-96fd3a384522160ea9d11cd9bad573576ca10d06.tar.bz2
Revert 70722 - Disable crashy TaskManagerBrowserTest.ReloadExtension
The test is being debugged, see http://crbug.com/42315. TBR=sky BUG=66957 TEST=browser_tests Review URL: http://codereview.chromium.org/6097009 TBR=sky Review URL: http://codereview.chromium.org/6155002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70726 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager')
-rw-r--r--chrome/browser/task_manager/task_manager_browsertest.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc
index 34b1b27..48082a6 100644
--- a/chrome/browser/task_manager/task_manager_browsertest.cc
+++ b/chrome/browser/task_manager/task_manager_browsertest.cc
@@ -335,8 +335,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest,
//
// This test has been crashy in the past, and is re-enabled temporarily to
// gather more diagnostic information. See http://crbug.com/42315.
-// Crashy, http://crbug.com/66957.
-IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DISABLED_ReloadExtension) {
+IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, ReloadExtension) {
// Show the task manager. This populates the model, and helps with debugging
// (you see the task manager).
browser()->window()->ShowTaskManager();