The 1st patch to disambiguate message center notifications

chrome/browser/ui/views/message_center/web_notification_tray_browsertest.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 "chrome/browser/ui/views/message_center/web_notification_tray.h"
 
 #include <set>
 
 #include "ash/root_window_controller.h"
 #include "ash/system/status_area_widget.h"
@@ skipping 78 matching lines @@
                                 new TestNotificationDelegate(new_id));
 
     g_browser_process->notification_ui_manager()->Add(
      notification, browser()->profile());
   }
 
   void RemoveNotification(const std::string& id) {
     g_browser_process->notification_ui_manager()->CancelById(id);
   }
 
+  bool HasNotification(message_center::MessageCenter* message_center,
+                       const std::string& id) {
+    return message_center->FindVisibleNotificationById(id) != NULL;
+  }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(WebNotificationTrayTest);
 };
 
 }  // namespace
 
 
 // TODO(dewittj): More exhaustive testing.
 IN_PROC_BROWSER_TEST_F(WebNotificationTrayTest, WebNotifications) {
   message_center::MessageCenter* message_center =
       message_center::MessageCenter::Get();
 
   // Add a notification.
   AddNotification("test_id1", "replace_id1");
   EXPECT_EQ(1u, message_center->NotificationCount());
-  EXPECT_TRUE(message_center->HasNotification("test_id1"));
-  EXPECT_FALSE(message_center->HasNotification("test_id2"));
+  EXPECT_TRUE(HasNotification(message_center, "test_id1"));
+  EXPECT_FALSE(HasNotification(message_center, "test_id2"));
   AddNotification("test_id2", "replace_id2");
   AddNotification("test_id2", "replace_id2");
   EXPECT_EQ(2u, message_center->NotificationCount());
-  EXPECT_TRUE(message_center->HasNotification("test_id2"));
+  EXPECT_TRUE(HasNotification(message_center, "test_id1"));
 
   // Ensure that updating a notification does not affect the count.
   UpdateNotification("replace_id2", "test_id3");
   UpdateNotification("replace_id2", "test_id3");
   EXPECT_EQ(2u, message_center->NotificationCount());
-  EXPECT_FALSE(message_center->HasNotification("test_id2"));
+  EXPECT_FALSE(HasNotification(message_center, "test_id2"));
 
   // Ensure that Removing the first notification removes it from the tray.
   RemoveNotification("test_id1");
-  EXPECT_FALSE(message_center->HasNotification("test_id1"));
+  EXPECT_FALSE(HasNotification(message_center, "test_id1"));
   EXPECT_EQ(1u, message_center->NotificationCount());
 
   // Remove the remaining notification.
   RemoveNotification("test_id3");
   EXPECT_EQ(0u, message_center->NotificationCount());
-  EXPECT_FALSE(message_center->HasNotification("test_id3"));
+  EXPECT_FALSE(HasNotification(message_center, "test_id1"));
 }
 
 IN_PROC_BROWSER_TEST_F(WebNotificationTrayTest, WebNotificationPopupBubble) {
   scoped_ptr<WebNotificationTray> tray(new WebNotificationTray(NULL));
   tray->message_center();
 
   // Adding a notification should show the popup bubble.
   AddNotification("test_id1", "replace_id1");
   EXPECT_TRUE(tray->message_center_tray_->popups_visible());
 
@@ skipping 94 matching lines @@
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(tray->status_icon_ == NULL);
   AddNotification("test_id", "replace_id");
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(tray->status_icon_ != NULL);
   RemoveNotification("test_id");
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(tray->status_icon_ != NULL);
 }
 }  // namespace message_center