Switch Windows to use the MessagePopupCollection

chrome/browser/ui/views/message_center/web_notification_tray_win_browsertest.cc

 // Copyright (c) 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_win.h"
 
 #include <set>
 
 #include "ash/root_window_controller.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/test/test_utils.h"
 #include "ui/message_center/message_center_tray.h"
 #include "ui/message_center/notification_list.h"
 #include "ui/message_center/notification_types.h"
 #include "ui/message_center/views/message_center_bubble.h"
-#include "ui/message_center/views/message_popup_bubble.h"
+#include "ui/message_center/views/message_popup_collection.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace message_center {
 
 namespace {
 
 class TestDelegate : public message_center::MessageCenter::Delegate {
@@ skipping 65 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(TestDelegate);
 };
 
 }  // namespace
 
 typedef InProcessBrowserTest WebNotificationTrayWinTest;
 
 // TODO(dewittj): More exhaustive testing.
 IN_PROC_BROWSER_TEST_F(WebNotificationTrayWinTest, WebNotifications) {
-  scoped_ptr<WebNotificationTrayWin> tray(new WebNotificationTrayWin());
-  message_center::MessageCenter* message_center = tray->message_center();
+  message_center::MessageCenter* message_center =
+      message_center::MessageCenter::Get();
   scoped_ptr<TestDelegate> delegate(new TestDelegate(message_center));
 
   // Add a notification.
   delegate->AddNotification("test_id1");
   EXPECT_EQ(1u, message_center->NotificationCount());
   EXPECT_TRUE(message_center->notification_list()->HasNotification("test_id1"));
   EXPECT_FALSE(
       message_center->notification_list()->HasNotification("test_id2"));
   delegate->AddNotification("test_id2");
   delegate->AddNotification("test_id2");
@@ skipping 62 matching lines @@
     delegate->AddNotification(id);
   }
   bool shown = tray->message_center_tray_->ShowMessageCenterBubble();
   EXPECT_TRUE(shown);
   content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(tray->message_center_bubble_.get() != NULL);
   EXPECT_EQ(notifications_to_add,
             message_center->NotificationCount());
   EXPECT_EQ(NotificationList::kMaxVisibleMessageCenterNotifications,
             tray->GetMessageCenterBubbleForTest()->NumMessageViewsForTest());
+  message_center->notification_list()->RemoveAllNotifications();
+  message_center->NotifyMessageCenterChanged(false);
 }
 
 IN_PROC_BROWSER_TEST_F(WebNotificationTrayWinTest, ManyPopupNotifications) {
   scoped_ptr<WebNotificationTrayWin> tray(new WebNotificationTrayWin());
   message_center::MessageCenter* message_center = tray->message_center();
   scoped_ptr<TestDelegate> delegate(new TestDelegate(message_center));
 
   // Add the max visible popup notifications +1, ensure the correct num visible.
   size_t notifications_to_add =
       NotificationList::kMaxVisiblePopupNotifications + 1;
   for (size_t i = 0; i < notifications_to_add; ++i) {
     std::string id = StringPrintf("test_id%d", static_cast<int>(i));
     delegate->AddNotification(id);
   }
   // Hide and reshow the bubble so that it is updated immediately, not delayed.
   tray->message_center_tray_->HidePopupBubble();
   tray->message_center_tray_->ShowPopupBubble();
   EXPECT_TRUE(tray->message_center_tray_->popups_visible());
   EXPECT_EQ(notifications_to_add,
             message_center->NotificationCount());
-  EXPECT_EQ(NotificationList::kMaxVisiblePopupNotifications,
-            tray->GetPopupBubbleForTest()->NumMessageViewsForTest());
-  message_center->SetDelegate(NULL);
+  NotificationList::PopupNotifications popups =
+      message_center->notification_list()->GetPopupNotifications();
+  EXPECT_EQ(NotificationList::kMaxVisiblePopupNotifications, popups.size());
   message_center->notification_list()->RemoveAllNotifications();
+  message_center->NotifyMessageCenterChanged(false);
 }
 
 }  // namespace message_center