Chromium Code Reviews| 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 "build/build_config.h" | |
| 9 #include "chrome/browser/apps/app_browsertest_util.h" | 10 #include "chrome/browser/apps/app_browsertest_util.h" |
| 10 #include "chrome/browser/browser_process.h" | 11 #include "chrome/browser/browser_process.h" |
| 11 #include "chrome/browser/extensions/api/notifications/notifications_api.h" | 12 #include "chrome/browser/extensions/api/notifications/notifications_api.h" |
| 12 #include "chrome/browser/extensions/extension_apitest.h" | 13 #include "chrome/browser/extensions/extension_apitest.h" |
| 13 #include "chrome/browser/extensions/extension_function_test_utils.h" | 14 #include "chrome/browser/extensions/extension_function_test_utils.h" |
| 14 #include "chrome/browser/notifications/notification.h" | 15 #include "chrome/browser/notifications/notification.h" |
| 15 #include "chrome/browser/notifications/notification_ui_manager.h" | 16 #include "chrome/browser/notifications/notification_ui_manager.h" |
| 16 #include "chrome/browser/profiles/profile_manager.h" | 17 #include "chrome/browser/profiles/profile_manager.h" |
| 17 #include "chrome/browser/ui/extensions/app_launch_params.h" | 18 #include "chrome/browser/ui/extensions/app_launch_params.h" |
| 18 #include "chrome/browser/ui/extensions/application_launch.h" | 19 #include "chrome/browser/ui/extensions/application_launch.h" |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 182 {extensions::kAllowFullscreenAppNotificationsFeature}); | 183 {extensions::kAllowFullscreenAppNotificationsFeature}); |
| 183 } | 184 } |
| 184 | 185 |
| 185 private: | 186 private: |
| 186 base::test::ScopedFeatureList feature_list_; | 187 base::test::ScopedFeatureList feature_list_; |
| 187 }; | 188 }; |
| 188 | 189 |
| 189 } // namespace | 190 } // namespace |
| 190 | 191 |
| 191 // http://crbug.com/691913 | 192 // http://crbug.com/691913 |
| 192 #if defined(OS_LINUX) && !defined(NDEBUG) | 193 #if (defined(OS_LINUX) || defined(OS_WIN)) && !defined(NDEBUG) |
|
Evan Stade
2017/02/21 21:11:11
instead of NDEBUG, should we check DCHECK_IS_ON?
| |
| 193 #define MAYBE_TestBasicUsage DISABLED_TestBasicUsage | 194 #define MAYBE_TestBasicUsage DISABLED_TestBasicUsage |
| 194 #else | 195 #else |
| 195 #define MAYBE_TestBasicUsage TestBasicUsage | 196 #define MAYBE_TestBasicUsage TestBasicUsage |
| 196 #endif | 197 #endif |
| 197 IN_PROC_BROWSER_TEST_F(NotificationsApiTest, MAYBE_TestBasicUsage) { | 198 IN_PROC_BROWSER_TEST_F(NotificationsApiTest, MAYBE_TestBasicUsage) { |
| 198 ASSERT_TRUE(RunExtensionTest("notifications/api/basic_usage")) << message_; | 199 ASSERT_TRUE(RunExtensionTest("notifications/api/basic_usage")) << message_; |
| 199 } | 200 } |
| 200 | 201 |
| 201 IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestEvents) { | 202 IN_PROC_BROWSER_TEST_F(NotificationsApiTest, TestEvents) { |
| 202 ASSERT_TRUE(RunExtensionTest("notifications/api/events")) << message_; | 203 ASSERT_TRUE(RunExtensionTest("notifications/api/events")) << message_; |
| (...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 522 | 523 |
| 523 ASSERT_TRUE(GetFirstAppWindow(extension->id())->IsFullscreen()) | 524 ASSERT_TRUE(GetFirstAppWindow(extension->id())->IsFullscreen()) |
| 524 << "Not Fullscreen"; | 525 << "Not Fullscreen"; |
| 525 ASSERT_TRUE(GetFirstAppWindow(extension->id())->GetBaseWindow()->IsActive()) | 526 ASSERT_TRUE(GetFirstAppWindow(extension->id())->GetBaseWindow()->IsActive()) |
| 526 << "Not Active"; | 527 << "Not Active"; |
| 527 | 528 |
| 528 const message_center::NotificationList::PopupNotifications notifications = | 529 const message_center::NotificationList::PopupNotifications notifications = |
| 529 g_browser_process->message_center()->GetPopupNotifications(); | 530 g_browser_process->message_center()->GetPopupNotifications(); |
| 530 ASSERT_EQ(1u, notifications.size()); | 531 ASSERT_EQ(1u, notifications.size()); |
| 531 } | 532 } |
| OLD | NEW |