summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorasargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-07 21:54:21 +0000
committerasargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-07 21:54:21 +0000
commit49000b2d44f05ffef73c5b2f4ef955d632ec0373 (patch)
tree94acdf754a678771320c4cdcba86447938e570ea
parentbf97033addc8e72499652f64886ef89c7b062c39 (diff)
downloadchromium_src-49000b2d44f05ffef73c5b2f4ef955d632ec0373.zip
chromium_src-49000b2d44f05ffef73c5b2f4ef955d632ec0373.tar.gz
chromium_src-49000b2d44f05ffef73c5b2f4ef955d632ec0373.tar.bz2
Re-disable TaskManagerBrowserTest.ReloadExtension for now.
I got the data I needed from re-enabling it, and have a way to repro and am working on a fix. BUG=42315 TEST=none TBR=twiz Review URL: http://codereview.chromium.org/6106008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70784 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/task_manager/task_manager_browsertest.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc
index 48082a6..b17132f 100644
--- a/chrome/browser/task_manager/task_manager_browsertest.cc
+++ b/chrome/browser/task_manager/task_manager_browsertest.cc
@@ -333,9 +333,8 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest,
// Regression test for http://crbug.com/18693.
//
-// This test has been crashy in the past, and is re-enabled temporarily to
-// gather more diagnostic information. See http://crbug.com/42315.
-IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, ReloadExtension) {
+// This test is crashy. See http://crbug.com/42315.
+IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, DISABLED_ReloadExtension) {
// Show the task manager. This populates the model, and helps with debugging
// (you see the task manager).
browser()->window()->ShowTaskManager();