Reland r265807: "Moves the notification icon out of th..."

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 118 matching lines @@
   EXPECT_FALSE(message_center->HasNotification("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"));
 }
 
 IN_PROC_BROWSER_TEST_F(WebNotificationTrayTest, WebNotificationPopupBubble) {
-  scoped_ptr<WebNotificationTray> tray(new WebNotificationTray());
+  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());
 
   // Updating a notification should not hide the popup bubble.
   AddNotification("test_id2", "replace_id2");
   UpdateNotification("replace_id2", "test_id3");
   EXPECT_TRUE(tray->message_center_tray_->popups_visible());
 
   // Removing the first notification should not hide the popup bubble.
   RemoveNotification("test_id1");
   EXPECT_TRUE(tray->message_center_tray_->popups_visible());
 
   // Removing the visible notification should hide the popup bubble.
   RemoveNotification("test_id3");
   EXPECT_FALSE(tray->message_center_tray_->popups_visible());
 }
 
 using message_center::NotificationList;
 
 // Flaky, see http://crbug.com/222500 .
 IN_PROC_BROWSER_TEST_F(WebNotificationTrayTest,
                        DISABLED_ManyMessageCenterNotifications) {
-  scoped_ptr<WebNotificationTray> tray(new WebNotificationTray());
+  scoped_ptr<WebNotificationTray> tray(new WebNotificationTray(NULL));
   message_center::MessageCenter* message_center = tray->message_center();
 
   // Add the max visible notifications +1, ensure the correct visible number.
   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_delegate_ != NULL);
   EXPECT_EQ(notifications_to_add, message_center->NotificationCount());
   EXPECT_EQ(kMaxVisibleMessageCenterNotifications,
             tray->message_center_delegate_->NumMessageViewsForTest());
 }
 
 IN_PROC_BROWSER_TEST_F(WebNotificationTrayTest, ManyPopupNotifications) {
-  scoped_ptr<WebNotificationTray> tray(new WebNotificationTray());
+  scoped_ptr<WebNotificationTray> tray(new WebNotificationTray(NULL));
   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);
   }
@@ skipping 24 matching lines @@
   EXPECT_TRUE(message_center->IsMessageCenterVisible());
 
   mc_manager->EnsureMessageCenterClosed();
 
   EXPECT_FALSE(message_center->IsMessageCenterVisible());
   if (NULL != tray->message_center_delegate_)
     EXPECT_TRUE(tray->message_center_delegate_->GetWidget()->IsClosed());
 }
 
 }  // namespace message_center