summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_tabs_apitest.cc
diff options
context:
space:
mode:
authordmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-01 15:55:11 +0000
committerdmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-01 15:55:11 +0000
commiteabd366c82d6779e94a921688353c4c0c963fe3d (patch)
treefe6fe0868971ad242954fe54d9a314aa9d269f55 /chrome/browser/extensions/extension_tabs_apitest.cc
parentd19780b1c2e9f11c898163d2b4e1d5c1bc6a1108 (diff)
downloadchromium_src-eabd366c82d6779e94a921688353c4c0c963fe3d.zip
chromium_src-eabd366c82d6779e94a921688353c4c0c963fe3d.tar.gz
chromium_src-eabd366c82d6779e94a921688353c4c0c963fe3d.tar.bz2
Allow nested calls to AccessibilityEventRouterGtk::AddRootWidget and
AccessibilityEventRouterGtk::RemoveRootWidget via reference counting, which stops ExtensionApiTest, FLAKY_Tabs from crashing on chromeos. BUG=56479 TEST=ExtensionApiTest.FLAKY_Tabs no longer crashes, and added new AccessibilityEventRouterGtkTest. Review URL: http://codereview.chromium.org/3382025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61179 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_tabs_apitest.cc')
-rw-r--r--chrome/browser/extensions/extension_tabs_apitest.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc
index 793376d..d8c1bc3 100644
--- a/chrome/browser/extensions/extension_tabs_apitest.cc
+++ b/chrome/browser/extensions/extension_tabs_apitest.cc
@@ -9,13 +9,9 @@
#include "chrome/browser/profile.h"
#include "chrome/common/pref_names.h"
-// Tabs started crashing on CrOS and hanging browser tests
-// http://crbug.com/56479
-#if defined(OS_CHROMEOS)
-#define MAYBE_Tabs DISABLED_Tabs
// Tabs is flaky on chromeos, windows, linux views and linux dbg.
// http://crbug.com/48920
-#elif defined(OS_LINUX) || defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS)
#define MAYBE_Tabs FLAKY_Tabs
#elif defined(OS_MACOSX)
// Tabs appears to timeout, or maybe crash on mac.