| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 <stdint.h> | 5 #include <stdint.h> |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/feature_list.h" | 10 #include "base/feature_list.h" |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 } | 184 } |
| 185 | 185 |
| 186 std::unique_ptr<TestingProfileManager> profile_manager_; | 186 std::unique_ptr<TestingProfileManager> profile_manager_; |
| 187 TestingProfile* profile_; | 187 TestingProfile* profile_; |
| 188 content::TestBrowserThreadBundle thread_bundle_; | 188 content::TestBrowserThreadBundle thread_bundle_; |
| 189 std::unique_ptr<std::set<std::string>> displayed_notifications_; | 189 std::unique_ptr<std::set<std::string>> displayed_notifications_; |
| 190 }; | 190 }; |
| 191 | 191 |
| 192 // Native, non persistent notifications don't have delegates any more | 192 // Native, non persistent notifications don't have delegates any more |
| 193 #if !defined(OS_MACOSX) | 193 #if !defined(OS_MACOSX) |
| 194 #if defined(OS_ANDROID) |
| 195 // http://crbug.com/729247 |
| 196 #define DisplayPageDisplayedEvent DISABLED_DisplayPageDisplayedEvent |
| 197 #endif |
| 194 TEST_F(PlatformNotificationServiceTest, DisplayPageDisplayedEvent) { | 198 TEST_F(PlatformNotificationServiceTest, DisplayPageDisplayedEvent) { |
| 195 auto* delegate = CreateSimplePageNotification(); | 199 auto* delegate = CreateSimplePageNotification(); |
| 196 | 200 |
| 197 EXPECT_EQ(1u, GetNotificationCount()); | 201 EXPECT_EQ(1u, GetNotificationCount()); |
| 198 EXPECT_TRUE(delegate->displayed()); | 202 EXPECT_TRUE(delegate->displayed()); |
| 199 } | 203 } |
| 200 #endif // !defined(OS_MACOSX) | 204 #endif // !defined(OS_MACOSX) |
| 201 | 205 |
| 202 TEST_F(PlatformNotificationServiceTest, DisplayPageCloseClosure) { | 206 TEST_F(PlatformNotificationServiceTest, DisplayPageCloseClosure) { |
| 203 base::Closure close_closure; | 207 base::Closure close_closure; |
| (...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 432 profile(), | 436 profile(), |
| 433 GURL() /* service_worker_scope */, | 437 GURL() /* service_worker_scope */, |
| 434 GURL("chrome-extension://honijodknafkokifofgiaalefdiedpko/main.html"), | 438 GURL("chrome-extension://honijodknafkokifofgiaalefdiedpko/main.html"), |
| 435 notification_data, NotificationResources(), | 439 notification_data, NotificationResources(), |
| 436 new MockNotificationDelegate("hello")); | 440 new MockNotificationDelegate("hello")); |
| 437 EXPECT_EQ("NotificationTest", | 441 EXPECT_EQ("NotificationTest", |
| 438 base::UTF16ToUTF8(notification.context_message())); | 442 base::UTF16ToUTF8(notification.context_message())); |
| 439 } | 443 } |
| 440 | 444 |
| 441 #endif // BUILDFLAG(ENABLE_EXTENSIONS) | 445 #endif // BUILDFLAG(ENABLE_EXTENSIONS) |
| OLD | NEW |