summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-18 11:04:40 +0000
committernkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-18 11:04:40 +0000
commit3796751696cf767d3643cbdff3eddda174f30a0c (patch)
tree4d7c13548876bf048a00d358012a6bd021f374e2
parentf6a83f2f8119b28a01dd2559c53d33fd3fbc422a (diff)
downloadchromium_src-3796751696cf767d3643cbdff3eddda174f30a0c.zip
chromium_src-3796751696cf767d3643cbdff3eddda174f30a0c.tar.gz
chromium_src-3796751696cf767d3643cbdff3eddda174f30a0c.tar.bz2
Disable TaskManagerBrowserTest.ShutdownWhileOpen on Mac.
Crashes, see bug. BUG=92297 TEST=TaskManagerBrowserTest.ShutdownWhileOpen TBR=yoshiki@chromium.org Review URL: http://codereview.chromium.org/8336022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106053 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/task_manager/task_manager_browsertest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc
index 5890940..176c448 100644
--- a/chrome/browser/task_manager/task_manager_browsertest.cc
+++ b/chrome/browser/task_manager/task_manager_browsertest.cc
@@ -59,7 +59,7 @@ class TaskManagerBrowserTest : public ExtensionBrowserTest {
// Flaky crashes on ChromeOS (triggers pure virtual function call), see
// http://crbug.com/92297 for details
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) || defined(OS_MACOSX)
#define MAYBE_ShutdownWhileOpen DISABLED_ShutdownWhileOpen
#else
#define MAYBE_ShutdownWhileOpen ShutdownWhileOpen