summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/notifications_apitest.cc
diff options
context:
space:
mode:
authortorne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-27 13:24:46 +0000
committertorne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-27 13:24:46 +0000
commitcf856b4f6bf4a1efdd6097a0bdd06dca5781d868 (patch)
treeff486fe2dacd048c3e1a20ab04df08de9dc4237e /chrome/browser/extensions/notifications_apitest.cc
parent5971feabb0f22eee72b54ed3ee4c122410fbba6a (diff)
downloadchromium_src-cf856b4f6bf4a1efdd6097a0bdd06dca5781d868.zip
chromium_src-cf856b4f6bf4a1efdd6097a0bdd06dca5781d868.tar.gz
chromium_src-cf856b4f6bf4a1efdd6097a0bdd06dca5781d868.tar.bz2
Disable ExtensionApiTest.NotificationsHasPermission.
Timing out frequently on mac/linux; disabled on those platforms. BUG=98061 TBR=bolms@chromium.org Review URL: http://codereview.chromium.org/8051015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102918 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/notifications_apitest.cc')
-rw-r--r--chrome/browser/extensions/notifications_apitest.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/extensions/notifications_apitest.cc b/chrome/browser/extensions/notifications_apitest.cc
index da134b12..ea9affe 100644
--- a/chrome/browser/extensions/notifications_apitest.cc
+++ b/chrome/browser/extensions/notifications_apitest.cc
@@ -26,7 +26,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, NotificationsHasPermissionManifest) {
#endif
}
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, NotificationsHasPermission) {
+// http://crbug.com/98061
+#if defined(OS_MACOSX) || defined(OS_LINUX)
+#define MAYBE_NotificationsHasPermission DISABLED_NotificationsHasPermission
+#else
+#define MAYBE_NotificationsHasPermission NotificationsHasPermission
+#endif
+
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_NotificationsHasPermission) {
#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
// Notifications not supported on linux/views yet.
#else