summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-29 22:26:20 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-29 22:26:20 +0000
commita92423f495b2d72707212a000953ccb6080b0f0d (patch)
tree1247ba532c41e6a6cda04f7b62e485a4835b046f /chrome/browser
parent73a779cfefefd4a26cf401020434dbe9884c20b8 (diff)
downloadchromium_src-a92423f495b2d72707212a000953ccb6080b0f0d.zip
chromium_src-a92423f495b2d72707212a000953ccb6080b0f0d.tar.gz
chromium_src-a92423f495b2d72707212a000953ccb6080b0f0d.tar.bz2
Disabling the ExtensionApiTest.Tabs test on linux and mac as it fails there. This test was originally
disabled for chrome os and mac. TBR=amit Review URL: http://codereview.chromium.org/1574002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43004 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/extensions/extension_tabs_apitest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc
index 9931c92..35bbf0d 100644
--- a/chrome/browser/extensions/extension_tabs_apitest.cc
+++ b/chrome/browser/extensions/extension_tabs_apitest.cc
@@ -9,9 +9,9 @@
#include "chrome/browser/profile.h"
#include "chrome/common/pref_names.h"
-// TODO(skerner): This test is flaky in chromeos and on Mac OS X 10.6. Figure
-// out why and fix.
-#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(OS_MACOSX)
+// TODO(skerner): This test is flaky in linux, chromeos and on Mac OS X 10.6.
+// Figure out why and fix.
+#if defined(OS_LINUX) || defined(OS_MACOSX)
#define MAYBE_Tabs DISABLED_Tabs
#else
#define MAYBE_Tabs Tabs