ash: Remove broken display notification suppression when settings is open

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/common/system/web_notification/web_notification_tray.h"
 
 #include <utility>
 #include <vector>
 
 #include "ash/common/shelf/shelf_layout_manager.h"
@@ skipping 22 matching lines @@
 #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_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"
 
+#if defined(OS_CHROMEOS)
+#include "ash/system/chromeos/screen_layout_observer.h"
+#endif
+
 namespace ash {
 
 namespace {
 
 WebNotificationTray* GetTray() {
   return StatusAreaWidgetTestHelper::GetStatusAreaWidget()
       ->web_notification_tray();
 }
 
 WebNotificationTray* GetSecondaryTray() {
@@ skipping 209 matching lines @@
 }
 
 // Display notification is ChromeOS only.
 #if defined(OS_CHROMEOS)
 
 // Verifies if the notification appears on both displays when extended mode.
 TEST_P(WebNotificationTrayTest, PopupShownOnBothDisplays) {
   if (!SupportsMultipleDisplays())
     return;
 
-  // Enables to appear the notification for display changes.
-  test::TestSystemTrayDelegate* tray_delegate = GetSystemTrayDelegate();
-  tray_delegate->set_should_show_display_notification(true);
-
+  Shell::GetInstance()
+      ->screen_layout_observer()
+      ->set_show_notifications_for_testing(true);
   UpdateDisplay("400x400,200x200");
   // UpdateDisplay() creates the display notifications, so popup is visible.
   EXPECT_TRUE(GetTray()->IsPopupVisible());
   WebNotificationTray* secondary_tray = GetSecondaryTray();
   ASSERT_TRUE(secondary_tray);
   EXPECT_TRUE(secondary_tray->IsPopupVisible());
 
   // Transition to mirroring and then back to extended display, which recreates
   // root window controller and shelf with having notifications. This code
   // verifies it doesn't cause crash and popups are still visible. See
@@ skipping 226 matching lines @@
   EXPECT_FALSE(tray->draw_background_as_active());
 
   generator.ReleaseTouch();
   EXPECT_FALSE(tray->draw_background_as_active());
   EXPECT_FALSE(tray->IsMessageCenterBubbleVisible());
 }
 
 #endif  // OS_CHROMEOS
 
 }  // namespace ash