| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/strings/string_number_conversions.h" | 5 #include "base/strings/string_number_conversions.h" |
| 6 #include "base/strings/stringprintf.h" | 6 #include "base/strings/stringprintf.h" |
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 8 #include "base/test/scoped_feature_list.h" | 8 #include "base/test/scoped_feature_list.h" |
| 9 #include "chrome/browser/apps/app_browsertest_util.h" | 9 #include "chrome/browser/apps/app_browsertest_util.h" |
| 10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 {features::kPreferHtmlOverPlugins}, | 181 {features::kPreferHtmlOverPlugins}, |
| 182 {extensions::kAllowFullscreenAppNotificationsFeature}); | 182 {extensions::kAllowFullscreenAppNotificationsFeature}); |
| 183 } | 183 } |
| 184 | 184 |
| 185 private: | 185 private: |
| 186 base::test::ScopedFeatureList feature_list_; | 186 base::test::ScopedFeatureList feature_list_; |
| 187 }; | 187 }; |
| 188 | 188 |
| 189 } // namespace | 189 } // namespace |
| 190 | 190 |
| 191 IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestBasicUsage) { | 191 // http://crbug.com/691913 |
| 192 #if defined(OS_LINUX) && !defined(NDEBUG) |
| 193 #define MAYBE_TestBasicUsage DISABLED_TestBasicUsage |
| 194 #else |
| 195 #define MAYBE_TestBasicUsage TestBasicUsage |
| 196 #endif |
| 197 IN_PROC_BROWSER_TEST_F(NotificationsApiTest, MAYBE_TestBasicUsage) { |
| 192 ASSERT_TRUE(RunExtensionTest("notifications/api/basic_usage")) << message_; | 198 ASSERT_TRUE(RunExtensionTest("notifications/api/basic_usage")) << message_; |
| 193 } | 199 } |
| 194 | 200 |
| 195 IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestEvents) { | 201 IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestEvents) { |
| 196 ASSERT_TRUE(RunExtensionTest("notifications/api/events")) << message_; | 202 ASSERT_TRUE(RunExtensionTest("notifications/api/events")) << message_; |
| 197 } | 203 } |
| 198 | 204 |
| 199 IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestCSP) { | 205 IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestCSP) { |
| 200 ASSERT_TRUE(RunExtensionTest("notifications/api/csp")) << message_; | 206 ASSERT_TRUE(RunExtensionTest("notifications/api/csp")) << message_; |
| 201 } | 207 } |
| (...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 516 | 522 |
| 517 ASSERT_TRUE(GetFirstAppWindow(extension->id())->IsFullscreen()) | 523 ASSERT_TRUE(GetFirstAppWindow(extension->id())->IsFullscreen()) |
| 518 << "Not Fullscreen"; | 524 << "Not Fullscreen"; |
| 519 ASSERT_TRUE(GetFirstAppWindow(extension->id())->GetBaseWindow()->IsActive()) | 525 ASSERT_TRUE(GetFirstAppWindow(extension->id())->GetBaseWindow()->IsActive()) |
| 520 << "Not Active"; | 526 << "Not Active"; |
| 521 | 527 |
| 522 const message_center::NotificationList::PopupNotifications notifications = | 528 const message_center::NotificationList::PopupNotifications notifications = |
| 523 g_browser_process->message_center()->GetPopupNotifications(); | 529 g_browser_process->message_center()->GetPopupNotifications(); |
| 524 ASSERT_EQ(1u, notifications.size()); | 530 ASSERT_EQ(1u, notifications.size()); |
| 525 } | 531 } |
| OLD | NEW |