| Index: chrome/browser/notifications/notification_browsertest.cc
|
| diff --git a/chrome/browser/notifications/notification_browsertest.cc b/chrome/browser/notifications/notification_browsertest.cc
|
| index 5fef1b297707568641fbfdfad94f44b5a642c312..861ad2b174ce37c61638c45bfb37a9327a3945f6 100644
|
| --- a/chrome/browser/notifications/notification_browsertest.cc
|
| +++ b/chrome/browser/notifications/notification_browsertest.cc
|
| @@ -45,6 +45,11 @@
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "ui/base/window_open_disposition.h"
|
|
|
| +// TODO(kbr): remove: http://crbug.com/222296
|
| +#if defined(OS_MACOSX)
|
| +#import "base/mac/mac_util.h"
|
| +#endif
|
| +
|
| #if defined(ENABLE_MESSAGE_CENTER)
|
| #include "ui/message_center/message_center.h"
|
| #endif
|
| @@ -500,6 +505,12 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestNoUserGestureInfobar) {
|
| #if !defined(OS_CHROMEOS)
|
|
|
| IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCreateSimpleNotification) {
|
| +#if defined(OS_MACOSX)
|
| + // TODO(kbr): re-enable: http://crbug.com/222296
|
| + if (base::mac::IsOSMountainLionOrLater())
|
| + return;
|
| +#endif
|
| +
|
| // Creates a simple notification.
|
| AllowAllOrigins();
|
| ui_test_utils::NavigateToURL(browser(), test_page_url_);
|
| @@ -528,6 +539,12 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCreateSimpleNotification) {
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCloseNotification) {
|
| +#if defined(OS_MACOSX)
|
| + // TODO(kbr): re-enable: http://crbug.com/222296
|
| + if (base::mac::IsOSMountainLionOrLater())
|
| + return;
|
| +#endif
|
| +
|
| // Creates a notification and closes it.
|
| AllowAllOrigins();
|
| ui_test_utils::NavigateToURL(browser(), test_page_url_);
|
| @@ -553,6 +570,12 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCloseNotification) {
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCancelNotification) {
|
| +#if defined(OS_MACOSX)
|
| + // TODO(kbr): re-enable: http://crbug.com/222296
|
| + if (base::mac::IsOSMountainLionOrLater())
|
| + return;
|
| +#endif
|
| +
|
| // Creates a notification and cancels it in the origin page.
|
| AllowAllOrigins();
|
| ui_test_utils::NavigateToURL(browser(), test_page_url_);
|
| @@ -575,6 +598,12 @@ IN_PROC_BROWSER_TEST_F(NotificationsTest, TestPermissionInfobarAppears) {
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_F(NotificationsTest, TestAllowOnPermissionInfobar) {
|
| +#if defined(OS_MACOSX)
|
| + // TODO(kbr): re-enable: http://crbug.com/222296
|
| + if (base::mac::IsOSMountainLionOrLater())
|
| + return;
|
| +#endif
|
| +
|
| // Tries to create a notification and clicks allow on the infobar.
|
| ui_test_utils::NavigateToURL(browser(), test_page_url_);
|
| // This notification should not be shown because we do not have permission.
|
|
|