ash: Remove broken display notification suppression when settings is open

ash/display/mirror_window_controller_unittest.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 "ash/display/mirror_window_controller.h"
 
 #include "ash/display/display_manager.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 193 matching lines @@
 }
 
 // Test the behavior of the cursor when entering software mirror mode swaps the
 // cursor's display.
 TEST_F(MirrorWindowControllerTest, MAYBE_MirrorCursorMoveOnEnter) {
   aura::Env* env = aura::Env::GetInstance();
   Shell* shell = Shell::GetInstance();
   WindowTreeHostManager* window_tree_host_manager =
       shell->window_tree_host_manager();
 
-  UpdateDisplay("400x400*2/r,400x400");
+  // Ensure the display is large enough that the cursor does not appear on top
+  // of the display change notifications (which changes the cursor to a hand).
+  UpdateDisplay("600x400*2/r,600x400");
   int64_t primary_display_id = window_tree_host_manager->GetPrimaryDisplayId();
   int64_t secondary_display_id = display_manager()->GetSecondaryDisplay().id();
   test::ScopedSetInternalDisplayId set_internal(display_manager(),
                                                 primary_display_id);
 
   // Chrome uses the internal display as the source display for software mirror
   // mode. Move the cursor to the external display.
   aura::Window* secondary_root_window =
       window_tree_host_manager->GetRootWindowForDisplayId(secondary_display_id);
   secondary_root_window->MoveCursorTo(gfx::Point(100, 200));
   EXPECT_EQ("300,200", env->last_mouse_location().ToString());
   test::CursorManagerTestApi cursor_test_api(shell->cursor_manager());
   EXPECT_EQ(1.0f, cursor_test_api.GetCurrentCursor().device_scale_factor());
   EXPECT_EQ(display::Display::ROTATE_0,
             cursor_test_api.GetCurrentCursorRotation());
 
   display_manager()->SetMultiDisplayMode(DisplayManager::MIRRORING);
-  UpdateDisplay("400x400*2/r,400x400");
+  UpdateDisplay("600x400*2/r,600x400");
 
   // Entering mirror mode should have centered the cursor on the primary display
   // because the cursor's previous position is out of bounds.
   // Check real cursor's position and properties.
-  EXPECT_EQ("100,100", env->last_mouse_location().ToString());
+  EXPECT_EQ("100,150", env->last_mouse_location().ToString());
   EXPECT_EQ(2.0f, cursor_test_api.GetCurrentCursor().device_scale_factor());
   EXPECT_EQ(display::Display::ROTATE_90,
             cursor_test_api.GetCurrentCursorRotation());
 
   // Check mirrored cursor's location.
   test::MirrorWindowTestApi test_api;
+  // The hot point location depends on the specific cursor.
+  EXPECT_EQ(ui::kCursorNull, test_api.GetCurrentCursorType());
   // Rotated hot point must be (25-7, 7).
   EXPECT_EQ("18,7", test_api.GetCursorHotPoint().ToString());
-  // New coordinates are not (200,200) because (200,200) is not the center of
+  // New coordinates are not (300,200) because (300,200) is not the center of
   // the display.
-  EXPECT_EQ("199,200",
+  EXPECT_EQ("299,200",
             test_api.GetCursorHotPointLocationInRootWindow().ToString());
 }
 
 // Make sure that the compositor based mirroring can switch
 // from/to dock mode.
 TEST_F(MirrorWindowControllerTest, MAYBE_DockMode) {
   const int64_t internal_id = 1;
   const int64_t external_id = 2;
 
   const display::ManagedDisplayInfo internal_display_info =
@@ skipping 37 matching lines @@
 }
 
 TEST_F(MirrorOnBootTest, MAYBE_MirrorOnBoot) {
   EXPECT_TRUE(display_manager()->IsInMirrorMode());
   RunAllPendingInMessageLoop();
   test::MirrorWindowTestApi test_api;
   EXPECT_TRUE(test_api.GetHost());
 }
 
 }  // namespace ash