| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/extensions/extension_apitest.h" | 5 #include "chrome/browser/extensions/extension_apitest.h" |
| 6 | 6 |
| 7 #include "chrome/browser/notifications/desktop_notification_service.h" | 7 #include "chrome/browser/notifications/desktop_notification_service.h" |
| 8 #include "chrome/browser/profile.h" | 8 #include "chrome/browser/profile.h" |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 | 10 |
| 11 // Fails and hoses bot, http://crbug.com/50060. | |
| 12 // Flaky, http://crbug.com/42314. | 11 // Flaky, http://crbug.com/42314. |
| 13 #if defined(OS_MACOSX) | 12 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_Notifications) { |
| 14 #define MAYBE_Notifications DISABLED_Notifications | |
| 15 #else | |
| 16 #define MAYBE_Notifications FLAKY_Notifications | |
| 17 #endif | |
| 18 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Notifications) { | |
| 19 #if defined(OS_LINUX) && defined(TOOLKIT_VIEWS) | 13 #if defined(OS_LINUX) && defined(TOOLKIT_VIEWS) |
| 20 // Notifications not supported on linux/views yet. | 14 // Notifications not supported on linux/views yet. |
| 21 #else | 15 #else |
| 22 ASSERT_TRUE(RunExtensionTest("notifications/has_not_permission")) << message_; | 16 ASSERT_TRUE(RunExtensionTest("notifications/has_not_permission")) << message_; |
| 23 ASSERT_TRUE(RunExtensionTest("notifications/has_permission_manifest")) | 17 ASSERT_TRUE(RunExtensionTest("notifications/has_permission_manifest")) |
| 24 << message_; | 18 << message_; |
| 25 browser()->profile()->GetDesktopNotificationService() | 19 browser()->profile()->GetDesktopNotificationService() |
| 26 ->GrantPermission(GURL( | 20 ->GrantPermission(GURL( |
| 27 "chrome-extension://peoadpeiejnhkmpaakpnompolbglelel")); | 21 "chrome-extension://peoadpeiejnhkmpaakpnompolbglelel")); |
| 28 ASSERT_TRUE(RunExtensionTest("notifications/has_permission_prefs")) | 22 ASSERT_TRUE(RunExtensionTest("notifications/has_permission_prefs")) |
| 29 << message_; | 23 << message_; |
| 30 #endif | 24 #endif |
| 31 } | 25 } |
| 32 | 26 |
| OLD | NEW |