Move ash/system/web_notification message_center to ui/

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/root_window_controller.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_item.h"
-#include "ash/system/web_notification/message_center_bubble.h"
-#include "ash/system/web_notification/popup_bubble.h"
-#include "ash/system/web_notification/web_notification_list.h"
+#include "ui/message_center/message_center_bubble.h"
+#include "ui/message_center/message_popup_bubble.h"
+#include "ui/message_center/notification_list.h"
 #include "ash/test/ash_test_base.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.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 ash {
 
@@ skipping 124 matching lines @@
 
   // Removing the first notification should not hide the popup bubble.
   delegate->RemoveNotification(tray, "test_id1");
   EXPECT_TRUE(tray->popup_bubble() != NULL);
 
   // Removing the visible notification should hide the popup bubble.
   delegate->RemoveNotification(tray, "test_id3");
   EXPECT_TRUE(tray->popup_bubble() == NULL);
 }
 
-using message_center::WebNotificationList;
+using message_center::NotificationList;
 
 TEST_F(WebNotificationTrayTest, ManyMessageCenterNotifications) {
   WebNotificationTray* tray = GetWebNotificationTray();
   scoped_ptr<TestDelegate> delegate(new TestDelegate);
   tray->message_center()->SetDelegate(delegate.get());
 
   // Add the max visible notifications +1, ensure the correct visible number.
   size_t notifications_to_add =
-      WebNotificationList::kMaxVisibleMessageCenterNotifications + 1;
+      NotificationList::kMaxVisibleMessageCenterNotifications + 1;
   for (size_t i = 0; i < notifications_to_add; ++i) {
     std::string id = StringPrintf("test_id%d", static_cast<int>(i));
     delegate->AddNotification(tray, id);
   }
   tray->ShowMessageCenterBubble();
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(tray->message_center_bubble() != NULL);
   EXPECT_EQ(notifications_to_add,
             tray->message_center()->NotificationCount());
-  EXPECT_EQ(WebNotificationList::kMaxVisibleMessageCenterNotifications,
+  EXPECT_EQ(NotificationList::kMaxVisibleMessageCenterNotifications,
             tray->GetMessageCenterBubbleForTest()->NumMessageViewsForTest());
 }
 
 TEST_F(WebNotificationTrayTest, ManyPopupNotifications) {
   WebNotificationTray* tray = GetWebNotificationTray();
   scoped_ptr<TestDelegate> delegate(new TestDelegate);
   tray->message_center()->SetDelegate(delegate.get());
 
   // Add the max visible popup notifications +1, ensure the correct num visible.
   size_t notifications_to_add =
-      WebNotificationList::kMaxVisiblePopupNotifications + 1;
+      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(tray, id);
   }
   // Hide and reshow the bubble so that it is updated immediately, not delayed.
   tray->HidePopupBubble();
   tray->ShowPopupBubble();
   EXPECT_TRUE(tray->popup_bubble() != NULL);
   EXPECT_EQ(notifications_to_add,
             tray->message_center()->NotificationCount());
-  EXPECT_EQ(WebNotificationList::kMaxVisiblePopupNotifications,
+  EXPECT_EQ(NotificationList::kMaxVisiblePopupNotifications,
             tray->GetPopupBubbleForTest()->NumMessageViewsForTest());
 }
 
 }  // namespace ash