Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5261)

Unified Diff: chrome/browser/notifications/platform_notification_service_unittest.cc

Issue 784383002: Support persistent notifications in the PlatformNotificationServiceImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@n-chrome-base
Patch Set: add copyright header Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/notifications/platform_notification_service_impl.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/notifications/platform_notification_service_unittest.cc
diff --git a/chrome/browser/notifications/platform_notification_service_unittest.cc b/chrome/browser/notifications/platform_notification_service_unittest.cc
index c76691fe4b3b00239379421ca6d4de94b9943232..322c55e2083d9008a2d279e0ac4180262b203bfd 100644
--- a/chrome/browser/notifications/platform_notification_service_unittest.cc
+++ b/chrome/browser/notifications/platform_notification_service_unittest.cc
@@ -3,9 +3,11 @@
// found in the LICENSE file.
#include "base/strings/utf_string_conversions.h"
+#include "base/time/time.h"
#include "chrome/browser/notifications/notification_test_util.h"
#include "chrome/browser/notifications/platform_notification_service_impl.h"
#include "chrome/test/base/testing_profile.h"
+#include "components/content_settings/core/browser/host_content_settings_map.h"
#include "content/public/browser/desktop_notification_delegate.h"
#include "content/public/common/platform_notification_data.h"
#include "content/public/test/test_browser_thread_bundle.h"
@@ -74,7 +76,7 @@ class PlatformNotificationServiceTest : public testing::Test {
new MockDesktopNotificationDelegate();
service()->DisplayNotification(profile(),
- GURL("https://example.com/"),
+ GURL("https://chrome.com/"),
SkBitmap(),
notification_data,
make_scoped_ptr(delegate),
@@ -124,6 +126,32 @@ TEST_F(PlatformNotificationServiceTest, DisplayPageCloseClosure) {
// delegate given that it'd result in a use-after-free.
}
+TEST_F(PlatformNotificationServiceTest, PersistentNotificationDisplay) {
+ content::PlatformNotificationData notification_data;
+ notification_data.title = base::ASCIIToUTF16("My notification's title");
+ notification_data.body = base::ASCIIToUTF16("Hello, world!");
+
+ service()->DisplayPersistentNotification(profile(),
+ 42 /* sw_registration_id */,
+ GURL("https://chrome.com/"),
+ SkBitmap(),
+ notification_data,
+ 0 /* render_process_id */);
+
+ ASSERT_EQ(1u, ui_manager()->GetNotificationCount());
+
+ const Notification& notification = ui_manager()->GetNotificationAt(0);
+ EXPECT_EQ("https://chrome.com/", notification.origin_url().spec());
+ EXPECT_EQ("My notification's title",
+ base::UTF16ToUTF8(notification.title()));
+ EXPECT_EQ("Hello, world!",
+ base::UTF16ToUTF8(notification.message()));
+
+ service()->ClosePersistentNotification(profile(),
+ notification.delegate_id());
+ EXPECT_EQ(0u, ui_manager()->GetNotificationCount());
+}
+
TEST_F(PlatformNotificationServiceTest, DisplayPageNotificationMatches) {
content::PlatformNotificationData notification_data;
notification_data.title = base::ASCIIToUTF16("My notification's title");
@@ -160,3 +188,29 @@ TEST_F(PlatformNotificationServiceTest, DisplayNameForOrigin) {
// TODO(peter): Include unit tests for the extension-name translation
// functionality of DisplayNameForOriginInProcessId.
}
+
+TEST_F(PlatformNotificationServiceTest, NotificationPermissionLastUsage) {
+ // Both page and persistent notifications should update the last usage
+ // time of the notification permission for the origin.
+ GURL origin("https://chrome.com/");
+ base::Time begin_time;
+
+ CreateSimplePageNotification();
+
+ base::Time after_page_notification =
+ profile()->GetHostContentSettingsMap()->GetLastUsage(
+ origin, origin, CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
+ EXPECT_GT(after_page_notification, begin_time);
+
+ service()->DisplayPersistentNotification(profile(),
+ 42 /* sw_registration_id */,
+ origin,
+ SkBitmap(),
+ content::PlatformNotificationData(),
+ 0 /* render_process_id */);
+
+ base::Time after_persistent_notification =
+ profile()->GetHostContentSettingsMap()->GetLastUsage(
+ origin, origin, CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
+ EXPECT_GT(after_persistent_notification, after_page_notification);
+}
« no previous file with comments | « chrome/browser/notifications/platform_notification_service_impl.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698