The 1st patch to disambiguate message center notifications

ash/system/web_notification/web_notification_tray_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 "ash/system/web_notification/web_notification_tray.h"
 
 #include <vector>
 
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
@@ skipping 139 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(WebNotificationTrayTest);
 };
 
 TEST_F(WebNotificationTrayTest, WebNotifications) {
   // TODO(mukai): move this test case to ui/message_center.
   ASSERT_TRUE(GetWidget());
 
   // Add a notification.
   AddNotification("test_id1");
   EXPECT_EQ(1u, GetMessageCenter()->NotificationCount());
-  EXPECT_TRUE(GetMessageCenter()->HasNotification("test_id1"));
+  EXPECT_TRUE(GetMessageCenter()->FindVisibleNotificationById("test_id1"));
   AddNotification("test_id2");
   AddNotification("test_id2");
   EXPECT_EQ(2u, GetMessageCenter()->NotificationCount());
-  EXPECT_TRUE(GetMessageCenter()->HasNotification("test_id2"));
+  EXPECT_TRUE(GetMessageCenter()->FindVisibleNotificationById("test_id2"));
 
   // Ensure that updating a notification does not affect the count.
   UpdateNotification("test_id2", "test_id3");
   UpdateNotification("test_id3", "test_id3");
   EXPECT_EQ(2u, GetMessageCenter()->NotificationCount());
-  EXPECT_FALSE(GetMessageCenter()->HasNotification("test_id2"));
+  EXPECT_FALSE(GetMessageCenter()->FindVisibleNotificationById("test_id2"));
 
   // Ensure that Removing the first notification removes it from the tray.
   RemoveNotification("test_id1");
-  EXPECT_FALSE(GetMessageCenter()->HasNotification("test_id1"));
+  EXPECT_FALSE(GetMessageCenter()->FindVisibleNotificationById("test_id1"));
   EXPECT_EQ(1u, GetMessageCenter()->NotificationCount());
 
   // Remove the remianing notification.
   RemoveNotification("test_id3");
   EXPECT_EQ(0u, GetMessageCenter()->NotificationCount());
-  EXPECT_FALSE(GetMessageCenter()->HasNotification("test_id3"));
+  EXPECT_FALSE(GetMessageCenter()->FindVisibleNotificationById("test_id3"));
 }
 
 TEST_F(WebNotificationTrayTest, WebNotificationPopupBubble) {
   // TODO(mukai): move this test case to ui/message_center.
   ASSERT_TRUE(GetWidget());
 
   // Adding a notification should show the popup bubble.
   AddNotification("test_id1");
   EXPECT_TRUE(GetTray()->IsPopupVisible());
 
@@ skipping 278 matching lines @@
 
   // System tray is created on the primary display. The popups in the secondary
   // tray aren't affected.
   GetSystemTray()->ShowDefaultView(BUBBLE_CREATE_NEW);
   EXPECT_GT(work_area.size().GetArea(), GetPopupWorkArea().size().GetArea());
   EXPECT_EQ(work_area_second.ToString(),
             GetPopupWorkAreaForTray(GetSecondaryTray()).ToString());
 }
 
 }  // namespace ash