Fix ManyPopupNotifications test with --enable-rich-notifications.

Fix ManyPopupNotifications test with --enable-rich-notifications.

The switch to MessagePopupCollection broke this test but 
wasn't caught on the try bots since 
--enable-rich-notifications isn't run there. 

R=stevenjb@chromium.org
TBR=mukai@chromium.org
BUG=NONE 
TEST=ash_unittests --enable-rich-notifications


Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=186241

[dewittj, 2013-03-01 21:59:25]

Sorry for review spam, this is a duplicate of 
12381048 with a corrected baseurl.

[Jun Mukai, 2013-03-01 22:03:24]

lgtm

[stevenjb, 2013-03-04 19:38:09]

lgtm

[commit-bot: I haz the power, 2013-03-04 20:51:03]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dewittj@chromium.org/12391041/1

[commit-bot: I haz the power, 2013-03-05 00:15:37]

Failed to apply patch for
ash/system/web_notification/web_notification_tray_unittest.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file ash/system/web_notification/web_notification_tray_unittest.cc
  Hunk #1 FAILED at 14.
  1 out of 2 hunks FAILED -- saving rejects to file
ash/system/web_notification/web_notification_tray_unittest.cc.rej

Patch:       ash/system/web_notification/web_notification_tray_unittest.cc
Index: ash/system/web_notification/web_notification_tray_unittest.cc
diff --git a/ash/system/web_notification/web_notification_tray_unittest.cc
b/ash/system/web_notification/web_notification_tray_unittest.cc
index
45e0ac93704b23bac1878ca098a4283e9f0adfe3..c6595331ec0d2f156add23a9d9922af6e37c5884
100644
--- a/ash/system/web_notification/web_notification_tray_unittest.cc
+++ b/ash/system/web_notification/web_notification_tray_unittest.cc
@@ -14,7 +14,9 @@
 #include "base/utf_string_conversions.h"
 #include "ui/message_center/message_center_bubble.h"
 #include "ui/message_center/message_center_tray.h"
+#include "ui/message_center/message_center_util.h"
 #include "ui/message_center/message_popup_bubble.h"
+#include "ui/message_center/message_popup_collection.h"
 #include "ui/message_center/notification_list.h"
 #include "ui/message_center/notification_types.h"
 #include "ui/views/controls/label.h"
@@ -219,8 +221,16 @@ TEST_F(WebNotificationTrayTest, ManyPopupNotifications) {
   EXPECT_TRUE(tray->IsPopupVisible());
   EXPECT_EQ(notifications_to_add,
             get_message_center()->NotificationCount());
-  EXPECT_EQ(NotificationList::kMaxVisiblePopupNotifications,
-            tray->GetPopupBubbleForTest()->NumMessageViewsForTest());
+  if (message_center::IsRichNotificationEnabled()) {
+    NotificationList::Delegate* list_delegate =
+        tray->popup_collection_.get()->list_delegate_;
+    NotificationList::PopupNotifications popups =
+        list_delegate->GetNotificationList()->GetPopupNotifications();
+    EXPECT_EQ(NotificationList::kMaxVisiblePopupNotifications, popups.size());
+  } else {
+    EXPECT_EQ(NotificationList::kMaxVisiblePopupNotifications,
+              tray->GetPopupBubbleForTest()->NumMessageViewsForTest());
+  }
   get_message_center()->SetDelegate(NULL);
   get_message_center()->notification_list()->RemoveAllNotifications();
 }

[commit-bot: I haz the power, 2013-03-05 17:41:27]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dewittj@chromium.org/12391041/4003

[commit-bot: I haz the power, 2013-03-05 20:26:33]

Change committed as 186241