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>2010-12-15 08:06:09 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-15 08:06:09 +0000
commit8c649fbfc809fe8ed32d9872db0a2e2ad866f93b (patch)
tree58413df0d5740f285c41597b4a1e0aebc5cf6ff9 /chrome/browser/task_manager
parentcfac78d9bd1e3abbcc45a3d0227dd6bb8343cdd1 (diff)
downloadchromium_src-8c649fbfc809fe8ed32d9872db0a2e2ad866f93b.zip
chromium_src-8c649fbfc809fe8ed32d9872db0a2e2ad866f93b.tar.gz
chromium_src-8c649fbfc809fe8ed32d9872db0a2e2ad866f93b.tar.bz2
Disable crashy TaskManagerBrowserTest.KillExtensionAndReload
TBR=sky BUG=66957 TEST=browser_tests Review URL: http://codereview.chromium.org/5883001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69236 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager')
-rw-r--r--chrome/browser/task_manager/task_manager_browsertest.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc
index 68a4f94..b944869 100644
--- a/chrome/browser/task_manager/task_manager_browsertest.cc
+++ b/chrome/browser/task_manager/task_manager_browsertest.cc
@@ -296,7 +296,9 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, KillExtension) {
WaitForResourceChange(2);
}
-IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, KillExtensionAndReload) {
+// Disabled, http://crbug.com/66957.
+IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest,
+ DISABLED_KillExtensionAndReload) {
// Show the task manager. This populates the model, and helps with debugging
// (you see the task manager).
browser()->window()->ShowTaskManager();