The 1st patch to disambiguate message center 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 118 matching lines @@
   ASSERT_EQ(0u, notification_list()->NotificationCount(blockers()));
   ASSERT_EQ(0u, notification_list()->UnreadCount(blockers()));
 
   std::string id0 = AddNotification();
   EXPECT_EQ(1u, notification_list()->NotificationCount(blockers()));
   std::string id1 = AddNotification();
   EXPECT_EQ(2u, notification_list()->NotificationCount(blockers()));
   EXPECT_EQ(2u, notification_list()->UnreadCount(blockers()));
 
   EXPECT_TRUE(notification_list()->HasPopupNotifications(blockers()));
-  EXPECT_TRUE(notification_list()->HasNotification(id0));
-  EXPECT_TRUE(notification_list()->HasNotification(id1));
-  EXPECT_FALSE(notification_list()->HasNotification(id1 + "foo"));
+  EXPECT_TRUE(notification_list()->GetNotificationById(id0));
+  EXPECT_TRUE(notification_list()->GetNotificationById(id1));
+  EXPECT_FALSE(notification_list()->GetNotificationById(id1 + "foo"));
 
   EXPECT_EQ(2u, GetPopupCounts());
 
   notification_list()->MarkSinglePopupAsShown(id0, true);
   notification_list()->MarkSinglePopupAsShown(id1, true);
   EXPECT_EQ(2u, notification_list()->NotificationCount(blockers()));
   EXPECT_EQ(0u, GetPopupCounts());
 
   notification_list()->RemoveNotification(id0);
   EXPECT_EQ(1u, notification_list()->NotificationCount(blockers()));
@@ skipping 561 matching lines @@
       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