The 1st patch to disambiguate message center notifications

ui/message_center/message_center_impl_unittest.cc

 // Copyright 2013 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/message_center_impl.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 599 matching lines @@
   std::string id("id1");
   std::string id2("id2");
   NotifierId notifier_id1(NotifierId::APPLICATION, "app1");
 
   // First, add and update a notification to ensure updates happen
   // normally.
   scoped_ptr<Notification> notification(CreateSimpleNotification(id));
   message_center()->AddNotification(notification.Pass());
   notification.reset(CreateSimpleNotification(id2));
   message_center()->UpdateNotification(id, notification.Pass());
-  EXPECT_TRUE(message_center()->HasNotification(id2));
-  EXPECT_FALSE(message_center()->HasNotification(id));
+  EXPECT_TRUE(message_center()->FindVisibleNotificationById(id2));
+  EXPECT_FALSE(message_center()->FindVisibleNotificationById(id));
 
   // Then open the message center.
   message_center()->SetVisibility(VISIBILITY_MESSAGE_CENTER);
 
   // Then update a notification; nothing should have happened.
   notification.reset(CreateSimpleNotification(id));
   message_center()->UpdateNotification(id2, notification.Pass());
-  EXPECT_TRUE(message_center()->HasNotification(id2));
-  EXPECT_FALSE(message_center()->HasNotification(id));
+  EXPECT_TRUE(message_center()->FindVisibleNotificationById(id2));
+  EXPECT_FALSE(message_center()->FindVisibleNotificationById(id));
 
   // Close the message center; then the update should have propagated.
   message_center()->SetVisibility(VISIBILITY_TRANSIENT);
-  EXPECT_FALSE(message_center()->HasNotification(id2));
-  EXPECT_TRUE(message_center()->HasNotification(id));
+  EXPECT_FALSE(message_center()->FindVisibleNotificationById(id2));
+  EXPECT_TRUE(message_center()->FindVisibleNotificationById(id));
 }
 
 TEST_F(MessageCenterImplTest, ComplexQueueing) {
   std::string ids[5] = {"0", "1", "2", "3", "4p"};
   NotifierId notifier_id1(NotifierId::APPLICATION, "app1");
 
   scoped_ptr<Notification> notification;
   // Add some notifications
   int i = 0;
   for (; i < 3; i++) {
     notification.reset(CreateSimpleNotification(ids[i]));
     message_center()->AddNotification(notification.Pass());
   }
   for (i = 0; i < 3; i++) {
-    EXPECT_TRUE(message_center()->HasNotification(ids[i]));
+    EXPECT_TRUE(message_center()->FindVisibleNotificationById(ids[i]));
   }
   for (; i < 5; i++) {
-    EXPECT_FALSE(message_center()->HasNotification(ids[i]));
+    EXPECT_FALSE(message_center()->FindVisibleNotificationById(ids[i]));
   }
 
   notification.reset(CreateNotification(ids[4], NOTIFICATION_TYPE_PROGRESS));
   message_center()->AddNotification(notification.Pass());
 
   // Now start queueing.
   // NL: ["0", "1", "2", "4p"]
   message_center()->SetVisibility(VISIBILITY_MESSAGE_CENTER);
 
   // This should update notification "1" to have id "3".
   notification.reset(CreateSimpleNotification(ids[3]));
   message_center()->UpdateNotification(ids[1], notification.Pass());
 
   notification.reset(CreateSimpleNotification(ids[4]));
   message_center()->UpdateNotification(ids[4], notification.Pass());
 
   notification.reset(CreateNotification(ids[4], NOTIFICATION_TYPE_PROGRESS));
   message_center()->UpdateNotification(ids[4], notification.Pass());
 
   // This should update notification "3" to a new ID after we go TRANSIENT.
   notification.reset(CreateSimpleNotification("New id"));
   message_center()->UpdateNotification(ids[3], notification.Pass());
 
   // This should create a new "3", that doesn't overwrite the update to 3
   // before.
   notification.reset(CreateSimpleNotification(ids[3]));
   message_center()->AddNotification(notification.Pass());
 
   // The NL should still be the same: ["0", "1", "2", "4p"]
-  EXPECT_TRUE(message_center()->HasNotification(ids[0]));
-  EXPECT_TRUE(message_center()->HasNotification(ids[1]));
-  EXPECT_TRUE(message_center()->HasNotification(ids[2]));
-  EXPECT_FALSE(message_center()->HasNotification(ids[3]));
-  EXPECT_TRUE(message_center()->HasNotification(ids[4]));
+  EXPECT_TRUE(message_center()->FindVisibleNotificationById(ids[0]));
+  EXPECT_TRUE(message_center()->FindVisibleNotificationById(ids[1]));
+  EXPECT_TRUE(message_center()->FindVisibleNotificationById(ids[2]));
+  EXPECT_FALSE(message_center()->FindVisibleNotificationById(ids[3]));
+  EXPECT_TRUE(message_center()->FindVisibleNotificationById(ids[4]));
   EXPECT_EQ(message_center()->GetVisibleNotifications().size(), 4u);
   message_center()->SetVisibility(VISIBILITY_TRANSIENT);
 
-  EXPECT_TRUE(message_center()->HasNotification(ids[0]));
-  EXPECT_FALSE(message_center()->HasNotification(ids[1]));
-  EXPECT_TRUE(message_center()->HasNotification(ids[2]));
-  EXPECT_TRUE(message_center()->HasNotification(ids[3]));
-  EXPECT_TRUE(message_center()->HasNotification(ids[4]));
-  EXPECT_TRUE(message_center()->HasNotification("New id"));
+  EXPECT_TRUE(message_center()->FindVisibleNotificationById(ids[0]));
+  EXPECT_FALSE(message_center()->FindVisibleNotificationById(ids[1]));
+  EXPECT_TRUE(message_center()->FindVisibleNotificationById(ids[2]));
+  EXPECT_TRUE(message_center()->FindVisibleNotificationById(ids[3]));
+  EXPECT_TRUE(message_center()->FindVisibleNotificationById(ids[4]));
+  EXPECT_TRUE(message_center()->FindVisibleNotificationById("New id"));
   EXPECT_EQ(message_center()->GetVisibleNotifications().size(), 5u);
 }
 
 TEST_F(MessageCenterImplTest, QueuedDirectUpdates) {
   std::string id("id1");
   std::string id2("id2");
   NotifierId notifier_id1(NotifierId::APPLICATION, "app1");
 
   gfx::Size original_size(0, 0);
   // Open the message center to prevent adding notifications
   message_center()->SetVisibility(VISIBILITY_MESSAGE_CENTER);
 
   // Create new notification to be added to the queue; images all have the same
   // original size.
   scoped_ptr<Notification> notification(CreateSimpleNotification(id));
 
   // Double-check that sizes all match.
   const std::vector<ButtonInfo>& original_buttons = notification->buttons();
   ASSERT_EQ(2u, original_buttons.size());
 
   EXPECT_EQ(original_size, notification->icon().Size());
   EXPECT_EQ(original_size, notification->image().Size());
   EXPECT_EQ(original_size, original_buttons[0].icon.Size());
   EXPECT_EQ(original_size, original_buttons[1].icon.Size());
 
   message_center()->AddNotification(notification.Pass());
 
   // The notification should be in the queue.
-  EXPECT_FALSE(message_center()->HasNotification(id));
+  EXPECT_FALSE(message_center()->FindVisibleNotificationById(id));
 
   // Now try setting the icon to a different size.
   gfx::Size new_size(16, 16);
   EXPECT_NE(original_size, new_size);
 
   gfx::Canvas canvas(new_size, 1.0f, true);
   canvas.DrawColor(SK_ColorBLUE);
   gfx::Image testImage(gfx::Image(gfx::ImageSkia(canvas.ExtractImageRep())));
   message_center()->SetNotificationIcon(id, testImage);
   message_center()->SetNotificationImage(id, testImage);
   message_center()->SetNotificationButtonIcon(id, 0, testImage);
   message_center()->SetNotificationButtonIcon(id, 1, testImage);
 
   // The notification should be in the queue.
-  EXPECT_FALSE(message_center()->HasNotification(id));
+  EXPECT_FALSE(message_center()->FindVisibleNotificationById(id));
 
   // Close the message center; then the update should have propagated.
   message_center()->SetVisibility(VISIBILITY_TRANSIENT);
   // The notification should no longer be in the queue.
-  EXPECT_TRUE(message_center()->HasNotification(id));
+  EXPECT_TRUE(message_center()->FindVisibleNotificationById(id));
 
   Notification* mc_notification =
       *(message_center()->GetVisibleNotifications().begin());
   const std::vector<ButtonInfo>& buttons = mc_notification->buttons();
   ASSERT_EQ(2u, buttons.size());
 
   EXPECT_EQ(new_size, mc_notification->icon().Size());
   EXPECT_EQ(new_size, mc_notification->image().Size());
   EXPECT_EQ(new_size, buttons[0].icon.Size());
   EXPECT_EQ(new_size, buttons[1].icon.Size());
@@ skipping 106 matching lines @@
   ASSERT_EQ(3u, message_center()->NotificationCount());
 
   // Now we remove the remaining notifications.
   notifier_settings_observer()->NotifierEnabledChanged(
       NotifierId(NotifierId::APPLICATION, "app1"), false);
   ASSERT_EQ(0u, message_center()->NotificationCount());
 }
 
 }  // namespace internal
 }  // namespace message_center