summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/notifications_apitest.cc
diff options
context:
space:
mode:
authorzmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-29 05:06:52 +0000
committerzmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-29 05:06:52 +0000
commit031a896a99158cb6f203c2f6f45d87f7ea178da6 (patch)
tree82e8927eb342ed6047c1c229928b55c2c6976261 /chrome/browser/extensions/notifications_apitest.cc
parent18c69d7a46962952cec1aed4450363c7ad00ab13 (diff)
downloadchromium_src-031a896a99158cb6f203c2f6f45d87f7ea178da6.zip
chromium_src-031a896a99158cb6f203c2f6f45d87f7ea178da6.tar.gz
chromium_src-031a896a99158cb6f203c2f6f45d87f7ea178da6.tar.bz2
Mark notifications api tests as DISABLED
BUG=105681 TEST= TBR=asargent Review URL: http://codereview.chromium.org/8726029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111870 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/notifications_apitest.cc')
-rw-r--r--chrome/browser/extensions/notifications_apitest.cc13
1 files changed, 4 insertions, 9 deletions
diff --git a/chrome/browser/extensions/notifications_apitest.cc b/chrome/browser/extensions/notifications_apitest.cc
index ea9affe..d3640aa 100644
--- a/chrome/browser/extensions/notifications_apitest.cc
+++ b/chrome/browser/extensions/notifications_apitest.cc
@@ -9,7 +9,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, NotificationsNoPermission) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_NotificationsNoPermission) {
#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
// Notifications not supported on linux/views yet.
#else
@@ -17,7 +17,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, NotificationsNoPermission) {
#endif
}
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, NotificationsHasPermissionManifest) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest,
+ DISABLED_NotificationsHasPermissionManifest) {
#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
// Notifications not supported on linux/views yet.
#else
@@ -27,13 +28,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, NotificationsHasPermissionManifest) {
}
// 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) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_NotificationsHasPermission) {
#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
// Notifications not supported on linux/views yet.
#else