Message center re-organized

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 155 matching lines @@
   size_t notifications_to_add = kMaxVisibleMessageCenterNotifications + 1;
   for (size_t i = 0; i < notifications_to_add; ++i) {
     std::string id = base::StringPrintf("test_id%d", static_cast<int>(i));
     std::string replace_id =
         base::StringPrintf("replace_id%d", static_cast<int>(i));
     AddNotification(id, replace_id);
   }
   bool shown = tray->message_center_tray_->ShowMessageCenterBubble();
   EXPECT_TRUE(shown);
   content::RunAllPendingInMessageLoop();
-  EXPECT_TRUE(tray->message_center_bubble_.get() != NULL);
+  EXPECT_TRUE(tray->message_center_delegate_ != NULL);
   EXPECT_EQ(notifications_to_add, message_center->NotificationCount());
   EXPECT_EQ(kMaxVisibleMessageCenterNotifications,
-            tray->GetMessageCenterBubbleForTest()->NumMessageViewsForTest());
+            tray->message_center_delegate_->NumMessageViewsForTest());
 }
 
 IN_PROC_BROWSER_TEST_F(WebNotificationTrayTest, ManyPopupNotifications) {
   scoped_ptr<WebNotificationTray> tray(new WebNotificationTray());
   message_center::MessageCenter* message_center = tray->message_center();
 
   // Add the max visible popup notifications +1, ensure the correct num visible.
   size_t notifications_to_add = kMaxVisiblePopupNotifications + 1;
   for (size_t i = 0; i < notifications_to_add; ++i) {
     std::string id = base::StringPrintf("test_id%d", static_cast<int>(i));
     std::string replace_id =
         base::StringPrintf("replace_id%d", static_cast<int>(i));
     AddNotification(id, replace_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());
   NotificationList::PopupNotifications popups =
       message_center->GetPopupNotifications();
   EXPECT_EQ(kMaxVisiblePopupNotifications, popups.size());
 }
 
 }  // namespace message_center