Elide origins displayed on web notifications.

ui/message_center/notification_list_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/message_center/notification_list.h"
 
 #include "base/basictypes.h"
 #include "base/i18n/time_formatting.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 35 matching lines @@
   std::string AddNotification() {
     return AddNotification(message_center::RichNotificationData());
   }
 
   // Construct a new notification for testing, but don't add it to the list yet.
   scoped_ptr<Notification> MakeNotification(
       const message_center::RichNotificationData& optional_fields,
       std::string* id_out) {
     *id_out = base::StringPrintf(kIdFormat, counter_);
     scoped_ptr<Notification> notification(new Notification(
-        message_center::NOTIFICATION_TYPE_SIMPLE,
-        *id_out,
+        message_center::NOTIFICATION_TYPE_SIMPLE, *id_out,
         UTF8ToUTF16(base::StringPrintf(kTitleFormat, counter_)),
-        UTF8ToUTF16(base::StringPrintf(kMessageFormat, counter_)),
-        gfx::Image(),
-        UTF8ToUTF16(kDisplaySource),
-        NotifierId(NotifierId::APPLICATION, kExtensionId),
-        optional_fields,
+        UTF8ToUTF16(base::StringPrintf(kMessageFormat, counter_)), gfx::Image(),
+        UTF8ToUTF16(kDisplaySource), GURL(),
+        NotifierId(NotifierId::APPLICATION, kExtensionId), optional_fields,
         NULL));
     return notification.Pass();
   }
 
   scoped_ptr<Notification> MakeNotification(std::string* id_out) {
     return MakeNotification(message_center::RichNotificationData(), id_out);
   }
 
   // Utility methods of AddNotification.
   std::string AddPriorityNotification(NotificationPriority priority) {
@@ skipping 105 matching lines @@
   EXPECT_EQ(1u, notification_list()->UnreadCount(blockers()));
   notification_list()->MarkSinglePopupAsDisplayed(id1);
   EXPECT_EQ(0u, notification_list()->UnreadCount(blockers()));
 }
 
 TEST_F(NotificationListTest, UpdateNotification) {
   std::string id0 = AddNotification();
   std::string replaced = id0 + "_replaced";
   EXPECT_EQ(1u, notification_list()->NotificationCount(blockers()));
   scoped_ptr<Notification> notification(
-      new Notification(message_center::NOTIFICATION_TYPE_SIMPLE,
-                       replaced,
-                       UTF8ToUTF16("newtitle"),
-                       UTF8ToUTF16("newbody"),
-                       gfx::Image(),
-                       UTF8ToUTF16(kDisplaySource),
+      new Notification(message_center::NOTIFICATION_TYPE_SIMPLE, replaced,
+                       UTF8ToUTF16("newtitle"), UTF8ToUTF16("newbody"),
+                       gfx::Image(), UTF8ToUTF16(kDisplaySource), GURL(),
                        NotifierId(NotifierId::APPLICATION, kExtensionId),
-                       message_center::RichNotificationData(),
-                       NULL));
+                       message_center::RichNotificationData(), NULL));
   notification_list()->UpdateNotificationMessage(id0, notification.Pass());
   EXPECT_EQ(1u, notification_list()->NotificationCount(blockers()));
   const NotificationList::Notifications notifications =
       notification_list()->GetVisibleNotifications(blockers());
   EXPECT_EQ(replaced, (*notifications.begin())->id());
   EXPECT_EQ(UTF8ToUTF16("newtitle"), (*notifications.begin())->title());
   EXPECT_EQ(UTF8ToUTF16("newbody"), (*notifications.begin())->message());
 }
 
 TEST_F(NotificationListTest, GetNotificationsByNotifierId) {
   NotifierId id0(NotifierId::APPLICATION, "ext0");
   NotifierId id1(NotifierId::APPLICATION, "ext1");
   NotifierId id2(GURL("http://example.com"));
   NotifierId id3(NotifierId::SYSTEM_COMPONENT, "system-notifier");
-  scoped_ptr<Notification> notification(
-      new Notification(message_center::NOTIFICATION_TYPE_SIMPLE,
-                       "id0",
-                       UTF8ToUTF16("title0"),
-                       UTF8ToUTF16("message0"),
-                       gfx::Image(),
-                       UTF8ToUTF16("source0"),
-                       id0,
-                       message_center::RichNotificationData(),
-                       NULL));
+  scoped_ptr<Notification> notification(new Notification(
+      message_center::NOTIFICATION_TYPE_SIMPLE, "id0", UTF8ToUTF16("title0"),
+      UTF8ToUTF16("message0"), gfx::Image(), UTF8ToUTF16("source0"), GURL(),
+      id0, message_center::RichNotificationData(), NULL));
   notification_list()->AddNotification(notification.Pass());
-  notification.reset(new Notification(message_center::NOTIFICATION_TYPE_SIMPLE,
-                                      "id1",
-                                      UTF8ToUTF16("title1"),
-                                      UTF8ToUTF16("message1"),
-                                      gfx::Image(),
-                                      UTF8ToUTF16("source0"),
-                                      id0,
-                                      message_center::RichNotificationData(),
-                                      NULL));
+  notification.reset(new Notification(
+      message_center::NOTIFICATION_TYPE_SIMPLE, "id1", UTF8ToUTF16("title1"),
+      UTF8ToUTF16("message1"), gfx::Image(), UTF8ToUTF16("source0"), GURL(),
+      id0, message_center::RichNotificationData(), NULL));
   notification_list()->AddNotification(notification.Pass());
-  notification.reset(new Notification(message_center::NOTIFICATION_TYPE_SIMPLE,
-                                      "id2",
-                                      UTF8ToUTF16("title1"),
-                                      UTF8ToUTF16("message1"),
-                                      gfx::Image(),
-                                      UTF8ToUTF16("source1"),
-                                      id0,
-                                      message_center::RichNotificationData(),
-                                      NULL));
+  notification.reset(new Notification(
+      message_center::NOTIFICATION_TYPE_SIMPLE, "id2", UTF8ToUTF16("title1"),
+      UTF8ToUTF16("message1"), gfx::Image(), UTF8ToUTF16("source1"), GURL(),
+      id0, message_center::RichNotificationData(), NULL));
   notification_list()->AddNotification(notification.Pass());
-  notification.reset(new Notification(message_center::NOTIFICATION_TYPE_SIMPLE,
-                                      "id3",
-                                      UTF8ToUTF16("title1"),
-                                      UTF8ToUTF16("message1"),
-                                      gfx::Image(),
-                                      UTF8ToUTF16("source2"),
-                                      id1,
-                                      message_center::RichNotificationData(),
-                                      NULL));
+  notification.reset(new Notification(
+      message_center::NOTIFICATION_TYPE_SIMPLE, "id3", UTF8ToUTF16("title1"),
+      UTF8ToUTF16("message1"), gfx::Image(), UTF8ToUTF16("source2"), GURL(),
+      id1, message_center::RichNotificationData(), NULL));
   notification_list()->AddNotification(notification.Pass());
-  notification.reset(new Notification(message_center::NOTIFICATION_TYPE_SIMPLE,
-                                      "id4",
-                                      UTF8ToUTF16("title1"),
-                                      UTF8ToUTF16("message1"),
-                                      gfx::Image(),
-                                      UTF8ToUTF16("source2"),
-                                      id2,
-                                      message_center::RichNotificationData(),
-                                      NULL));
+  notification.reset(new Notification(
+      message_center::NOTIFICATION_TYPE_SIMPLE, "id4", UTF8ToUTF16("title1"),
+      UTF8ToUTF16("message1"), gfx::Image(), UTF8ToUTF16("source2"), GURL(),
+      id2, message_center::RichNotificationData(), NULL));
   notification_list()->AddNotification(notification.Pass());
-  notification.reset(new Notification(message_center::NOTIFICATION_TYPE_SIMPLE,
-                                      "id5",
-                                      UTF8ToUTF16("title1"),
-                                      UTF8ToUTF16("message1"),
-                                      gfx::Image(),
-                                      UTF8ToUTF16("source2"),
-                                      id3,
-                                      message_center::RichNotificationData(),
-                                      NULL));
+  notification.reset(new Notification(
+      message_center::NOTIFICATION_TYPE_SIMPLE, "id5", UTF8ToUTF16("title1"),
+      UTF8ToUTF16("message1"), gfx::Image(), UTF8ToUTF16("source2"), GURL(),
+      id3, message_center::RichNotificationData(), NULL));
   notification_list()->AddNotification(notification.Pass());
 
   NotificationList::Notifications by_notifier_id =
       notification_list()->GetNotificationsByNotifierId(id0);
   EXPECT_TRUE(IsInNotifications(by_notifier_id, "id0"));
   EXPECT_TRUE(IsInNotifications(by_notifier_id, "id1"));
   EXPECT_TRUE(IsInNotifications(by_notifier_id, "id2"));
   EXPECT_FALSE(IsInNotifications(by_notifier_id, "id3"));
   EXPECT_FALSE(IsInNotifications(by_notifier_id, "id4"));
   EXPECT_FALSE(IsInNotifications(by_notifier_id, "id5"));
@@ skipping 129 matching lines @@
   EXPECT_EQ(0u, GetPopupCounts());
 }
 
 TEST_F(NotificationListTest, PriorityPromotion) {
   std::string id0 = AddPriorityNotification(LOW_PRIORITY);
   std::string replaced = id0 + "_replaced";
   EXPECT_EQ(1u, notification_list()->NotificationCount(blockers()));
   EXPECT_EQ(0u, GetPopupCounts());
   message_center::RichNotificationData optional;
   optional.priority = 1;
-  scoped_ptr<Notification> notification(
-      new Notification(message_center::NOTIFICATION_TYPE_SIMPLE,
-                       replaced,
-                       UTF8ToUTF16("newtitle"),
-                       UTF8ToUTF16("newbody"),
-                       gfx::Image(),
-                       UTF8ToUTF16(kDisplaySource),
-                       NotifierId(NotifierId::APPLICATION, kExtensionId),
-                       optional,
-                       NULL));
+  scoped_ptr<Notification> notification(new Notification(
+      message_center::NOTIFICATION_TYPE_SIMPLE, replaced,
+      UTF8ToUTF16("newtitle"), UTF8ToUTF16("newbody"), gfx::Image(),
+      UTF8ToUTF16(kDisplaySource), GURL(),
+      NotifierId(NotifierId::APPLICATION, kExtensionId), optional, NULL));
   notification_list()->UpdateNotificationMessage(id0, notification.Pass());
   EXPECT_EQ(1u, notification_list()->NotificationCount(blockers()));
   EXPECT_EQ(1u, GetPopupCounts());
   const NotificationList::Notifications notifications =
       notification_list()->GetVisibleNotifications(blockers());
   EXPECT_EQ(replaced, (*notifications.begin())->id());
   EXPECT_EQ(UTF8ToUTF16("newtitle"), (*notifications.begin())->title());
   EXPECT_EQ(UTF8ToUTF16("newbody"), (*notifications.begin())->message());
   EXPECT_EQ(1, (*notifications.begin())->priority());
 }
 
 TEST_F(NotificationListTest, PriorityPromotionWithPopups) {
   std::string id0 = AddPriorityNotification(LOW_PRIORITY);
   std::string id1 = AddPriorityNotification(DEFAULT_PRIORITY);
   EXPECT_EQ(1u, GetPopupCounts());
   notification_list()->MarkSinglePopupAsShown(id1, true);
   EXPECT_EQ(0u, GetPopupCounts());
 
   // id0 promoted to LOW->DEFAULT, it'll appear as toast (popup).
   message_center::RichNotificationData priority;
   priority.priority = DEFAULT_PRIORITY;
-  scoped_ptr<Notification> notification(
-      new Notification(message_center::NOTIFICATION_TYPE_SIMPLE,
-                       id0,
-                       UTF8ToUTF16("newtitle"),
-                       UTF8ToUTF16("newbody"),
-                       gfx::Image(),
-                       UTF8ToUTF16(kDisplaySource),
-                       NotifierId(NotifierId::APPLICATION, kExtensionId),
-                       priority,
-                       NULL));
+  scoped_ptr<Notification> notification(new Notification(
+      message_center::NOTIFICATION_TYPE_SIMPLE, id0, UTF8ToUTF16("newtitle"),
+      UTF8ToUTF16("newbody"), gfx::Image(), UTF8ToUTF16(kDisplaySource), GURL(),
+      NotifierId(NotifierId::APPLICATION, kExtensionId), priority, NULL));
   notification_list()->UpdateNotificationMessage(id0, notification.Pass());
   EXPECT_EQ(1u, GetPopupCounts());
   notification_list()->MarkSinglePopupAsShown(id0, true);
   EXPECT_EQ(0u, GetPopupCounts());
 
   // update with no promotion change for id0, it won't appear as a toast.
-  notification.reset(new Notification(message_center::NOTIFICATION_TYPE_SIMPLE,
-                                      id0,
-                                      UTF8ToUTF16("newtitle2"),
-                                      UTF8ToUTF16("newbody2"),
-                                      gfx::Image(),
-                                      UTF8ToUTF16(kDisplaySource),
-                                      NotifierId(NotifierId::APPLICATION,
-                                                 kExtensionId),
-                                      priority,
-                                      NULL));
+  notification.reset(new Notification(
+      message_center::NOTIFICATION_TYPE_SIMPLE, id0, UTF8ToUTF16("newtitle2"),
+      UTF8ToUTF16("newbody2"), gfx::Image(), UTF8ToUTF16(kDisplaySource),
+      GURL(), NotifierId(NotifierId::APPLICATION, kExtensionId), priority,
+      NULL));
   notification_list()->UpdateNotificationMessage(id0, notification.Pass());
   EXPECT_EQ(0u, GetPopupCounts());
 
   // id1 promoted to DEFAULT->HIGH, it'll appear as toast (popup).
   priority.priority = HIGH_PRIORITY;
-  notification.reset(new Notification(message_center::NOTIFICATION_TYPE_SIMPLE,
-                                      id1,
-                                      UTF8ToUTF16("newtitle"),
-                                      UTF8ToUTF16("newbody"),
-                                      gfx::Image(),
-                                      UTF8ToUTF16(kDisplaySource),
-                                      NotifierId(NotifierId::APPLICATION,
-                                                 kExtensionId),
-                                      priority,
-                                      NULL));
+  notification.reset(new Notification(
+      message_center::NOTIFICATION_TYPE_SIMPLE, id1, UTF8ToUTF16("newtitle"),
+      UTF8ToUTF16("newbody"), gfx::Image(), UTF8ToUTF16(kDisplaySource), GURL(),
+      NotifierId(NotifierId::APPLICATION, kExtensionId), priority, NULL));
   notification_list()->UpdateNotificationMessage(id1, notification.Pass());
   EXPECT_EQ(1u, GetPopupCounts());
   notification_list()->MarkSinglePopupAsShown(id1, true);
   EXPECT_EQ(0u, GetPopupCounts());
 
   // id1 promoted to HIGH->MAX, it'll appear as toast again.
   priority.priority = MAX_PRIORITY;
-  notification.reset(new Notification(message_center::NOTIFICATION_TYPE_SIMPLE,
-                                      id1,
-                                      UTF8ToUTF16("newtitle2"),
-                                      UTF8ToUTF16("newbody2"),
-                                      gfx::Image(),
-                                      UTF8ToUTF16(kDisplaySource),
-                                      NotifierId(NotifierId::APPLICATION,
-                                                 kExtensionId),
-                                      priority,
-                                      NULL));
+  notification.reset(new Notification(
+      message_center::NOTIFICATION_TYPE_SIMPLE, id1, UTF8ToUTF16("newtitle2"),
+      UTF8ToUTF16("newbody2"), gfx::Image(), UTF8ToUTF16(kDisplaySource),
+      GURL(), NotifierId(NotifierId::APPLICATION, kExtensionId), priority,
+      NULL));
   notification_list()->UpdateNotificationMessage(id1, notification.Pass());
   EXPECT_EQ(1u, GetPopupCounts());
   notification_list()->MarkSinglePopupAsShown(id1, true);
   EXPECT_EQ(0u, GetPopupCounts());
 
   // id1 demoted to MAX->DEFAULT, no appearing as toast.
   priority.priority = DEFAULT_PRIORITY;
-  notification.reset(new Notification(message_center::NOTIFICATION_TYPE_SIMPLE,
-                                      id1,
-                                      UTF8ToUTF16("newtitle3"),
-                                      UTF8ToUTF16("newbody3"),
-                                      gfx::Image(),
-                                      UTF8ToUTF16(kDisplaySource),
-                                      NotifierId(NotifierId::APPLICATION,
-                                                 kExtensionId),
-                                      priority,
-                                      NULL));
+  notification.reset(new Notification(
+      message_center::NOTIFICATION_TYPE_SIMPLE, id1, UTF8ToUTF16("newtitle3"),
+      UTF8ToUTF16("newbody3"), gfx::Image(), UTF8ToUTF16(kDisplaySource),
+      GURL(), NotifierId(NotifierId::APPLICATION, kExtensionId), priority,
+      NULL));
   notification_list()->UpdateNotificationMessage(id1, notification.Pass());
   EXPECT_EQ(0u, GetPopupCounts());
 }
 
 TEST_F(NotificationListTest, WebNotificationUpdatePromotion) {
   std::string notification_id = "replaced-web-notification";
-  scoped_ptr<Notification> original_notification(
-      new Notification(message_center::NOTIFICATION_TYPE_SIMPLE,
-                       notification_id,
-                       UTF8ToUTF16("Web Notification"),
-                       UTF8ToUTF16("Notification contents"),
-                       gfx::Image(),
-                       UTF8ToUTF16(kDisplaySource),
-                       NotifierId(GURL("https://example.com/")),
-                       message_center::RichNotificationData(),
-                       NULL));
+  scoped_ptr<Notification> original_notification(new Notification(
+      message_center::NOTIFICATION_TYPE_SIMPLE, notification_id,
+      UTF8ToUTF16("Web Notification"), UTF8ToUTF16("Notification contents"),
+      gfx::Image(), UTF8ToUTF16(kDisplaySource), GURL(),
+      NotifierId(GURL("https://example.com/")),
+      message_center::RichNotificationData(), NULL));
 
   EXPECT_EQ(0u, GetPopupCounts());
   notification_list()->AddNotification(original_notification.Pass());
   EXPECT_EQ(1u, GetPopupCounts());
 
   notification_list()->MarkSinglePopupAsShown(notification_id, true);
   EXPECT_EQ(0u, GetPopupCounts());
 
-  scoped_ptr<Notification> replaced_notification(
-      new Notification(message_center::NOTIFICATION_TYPE_SIMPLE,
-                       notification_id,
-                       UTF8ToUTF16("Web Notification Replacement"),
-                       UTF8ToUTF16("New notification contents"),
-                       gfx::Image(),
-                       UTF8ToUTF16(kDisplaySource),
-                       NotifierId(GURL("https://example.com/")),
-                       message_center::RichNotificationData(),
-                       NULL));
+  scoped_ptr<Notification> replaced_notification(new Notification(
+      message_center::NOTIFICATION_TYPE_SIMPLE, notification_id,
+      UTF8ToUTF16("Web Notification Replacement"),
+      UTF8ToUTF16("New notification contents"), gfx::Image(),
+      UTF8ToUTF16(kDisplaySource), GURL(),
+      NotifierId(GURL("https://example.com/")),
+      message_center::RichNotificationData(), NULL));
 
   // Web Notifications will be re-shown as popups even if their priority didn't
   // change, to match the behavior of the Web Notification API.
   notification_list()->UpdateNotificationMessage(notification_id,
                                                  replaced_notification.Pass());
   EXPECT_EQ(1u, GetPopupCounts());
 }
 
 TEST_F(NotificationListTest, NotificationOrderAndPriority) {
   base::Time now = base::Time::Now();
@@ skipping 81 matching lines @@
   EXPECT_TRUE(n1->IsRead());
 
   notification_list()->MarkSinglePopupAsShown(id1, true);
 
   n1 = GetNotification(id1);
   EXPECT_TRUE(n1->shown_as_popup());
   EXPECT_TRUE(n1->IsRead());
 
   const std::string replaced("test-replaced-id");
   scoped_ptr<Notification> notification(
-      new Notification(message_center::NOTIFICATION_TYPE_SIMPLE,
-                       replaced,
-                       UTF8ToUTF16("newtitle"),
-                       UTF8ToUTF16("newbody"),
-                       gfx::Image(),
-                       UTF8ToUTF16(kDisplaySource),
+      new Notification(message_center::NOTIFICATION_TYPE_SIMPLE, replaced,
+                       UTF8ToUTF16("newtitle"), UTF8ToUTF16("newbody"),
+                       gfx::Image(), UTF8ToUTF16(kDisplaySource), GURL(),
                        NotifierId(NotifierId::APPLICATION, kExtensionId),
-                       message_center::RichNotificationData(),
-                       NULL));
+                       message_center::RichNotificationData(), NULL));
   notification_list()->UpdateNotificationMessage(id1, notification.Pass());
   n1 = GetNotification(id1);
   EXPECT_TRUE(n1 == NULL);
   const Notification* nr = GetNotification(replaced);
   EXPECT_TRUE(nr->shown_as_popup());
   EXPECT_TRUE(nr->IsRead());
 }
 
 TEST_F(NotificationListTest, QuietMode) {
   notification_list()->SetQuietMode(true);
@@ skipping 17 matching lines @@
   EXPECT_EQ(1u, notification_list()->UnreadCount(blockers()));
 
   notification_list()->MarkSinglePopupAsDisplayed(id);
   EXPECT_EQ(0u, notification_list()->UnreadCount(blockers()));
   notification_list()->MarkSinglePopupAsShown(
       id, false /* mark_notification_as_read */);
   EXPECT_EQ(1u, notification_list()->UnreadCount(blockers()));
 
   // Updates the notification  and verifies unread_count doesn't change.
   scoped_ptr<Notification> updated_notification(new Notification(
-      message_center::NOTIFICATION_TYPE_SIMPLE,
-      id,
-      UTF8ToUTF16("updated"),
-      UTF8ToUTF16("updated"),
-      gfx::Image(),
-      base::string16(),
-      NotifierId(),
-      RichNotificationData(),
-      NULL));
+      message_center::NOTIFICATION_TYPE_SIMPLE, id, UTF8ToUTF16("updated"),
+      UTF8ToUTF16("updated"), gfx::Image(), base::string16(), GURL(),
+      NotifierId(), RichNotificationData(), NULL));
   notification_list()->AddNotification(updated_notification.Pass());
   EXPECT_EQ(1u, notification_list()->UnreadCount(blockers()));
 }
 
 TEST_F(NotificationListTest, TestPushingShownNotification) {
   // Create a notification and mark it as shown.
   std::string id1;
   scoped_ptr<Notification> notification(MakeNotification(&id1));
   notification->set_shown_as_popup(true);
 
   // Call PushNotification on this notification.
   notification_list()->PushNotification(notification.Pass());
 
   // Ensure it is still marked as shown.
   EXPECT_TRUE(GetNotification(id1)->shown_as_popup());
 }
 
 TEST_F(NotificationListTest, TestHasNotificationOfType) {
   std::string id = AddNotification();
 
   EXPECT_TRUE(notification_list()->HasNotificationOfType(
       id, message_center::NOTIFICATION_TYPE_SIMPLE));
   EXPECT_FALSE(notification_list()->HasNotificationOfType(
       id, message_center::NOTIFICATION_TYPE_PROGRESS));
 
   scoped_ptr<Notification> updated_notification(new Notification(
-      message_center::NOTIFICATION_TYPE_PROGRESS,
-      id,
-      UTF8ToUTF16("updated"),
-      UTF8ToUTF16("updated"),
-      gfx::Image(),
-      base::string16(),
-      NotifierId(),
-      RichNotificationData(),
-      NULL));
+      message_center::NOTIFICATION_TYPE_PROGRESS, id, UTF8ToUTF16("updated"),
+      UTF8ToUTF16("updated"), gfx::Image(), base::string16(), GURL(),
+      NotifierId(), RichNotificationData(), NULL));
   notification_list()->AddNotification(updated_notification.Pass());
 
   EXPECT_FALSE(notification_list()->HasNotificationOfType(
       id, message_center::NOTIFICATION_TYPE_SIMPLE));
   EXPECT_TRUE(notification_list()->HasNotificationOfType(
       id, message_center::NOTIFICATION_TYPE_PROGRESS));
 }
 
 }  // namespace message_center