ash: Remove broken display notification suppression when settings is open

ash/wm/ash_native_cursor_manager_interactive_uitest.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 "ash/wm/ash_native_cursor_manager.h"
 
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/test/ash_interactive_ui_test_base.h"
 #include "ash/test/cursor_manager_test_api.h"
 #include "base/run_loop.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/test/ui_controls.h"
 #include "ui/display/manager/managed_display_info.h"
 
+#if defined(OS_CHROMEOS)
+#include "ash/system/chromeos/screen_layout_observer.h"
+#endif
+
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 
 #include "ui/gfx/x/x11_types.h"
 #endif
 
 namespace ash {
 
 using AshNativeCursorManagerTest = test::AshInteractiveUITestBase;
 
 namespace {
 
+#if defined(OS_CHROMEOS)
+class ScopedSuppressNotifications {
+ public:
+  ScopedSuppressNotifications() {
+    ScreenLayoutObserver::SuppressNotificationsForTesting(true);
+  }
+  ~ScopedSuppressNotifications() {
+    ScreenLayoutObserver::SuppressNotificationsForTesting(false);
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ScopedSuppressNotifications);
+};
+#endif  // defined(OS_CHROMEOS)
+
 display::ManagedDisplayInfo CreateDisplayInfo(int64_t id,
                                               const gfx::Rect& bounds,
                                               float device_scale_factor) {
   display::ManagedDisplayInfo info(id, "", false);
   info.SetBounds(bounds);
   info.set_device_scale_factor(device_scale_factor);
   return info;
 }
 
 void MoveMouseSync(aura::Window* window, int x, int y) {
@@ skipping 11 matching lines @@
 
 }  // namespace
 
 #if defined(USE_X11)
 #define MAYBE_CursorChangeOnEnterNotify CursorChangeOnEnterNotify
 #else
 #define MAYBE_CursorChangeOnEnterNotify DISABLED_CursorChangeOnEnterNotify
 #endif
 
 TEST_F(AshNativeCursorManagerTest, MAYBE_CursorChangeOnEnterNotify) {
+#if defined(OS_CHROMEOS)
+  // Showing notifications causes crashes in Skia due to discardable memory
+  // allocator problems. It's not clear why.
+  ScopedSuppressNotifications suppress_notifications;

[oshima, 2016/10/11 17:19:00]

can you file a bug with a stack?

[James Cook, 2016/10/11 18:01:04]

Added link to bug.

+#endif
+
   ::wm::CursorManager* cursor_manager = Shell::GetInstance()->cursor_manager();
   test::CursorManagerTestApi test_api(cursor_manager);
 
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   display::ManagedDisplayInfo display_info1 =
       CreateDisplayInfo(10, gfx::Rect(0, 0, 500, 300), 1.0f);
   display::ManagedDisplayInfo display_info2 =
       CreateDisplayInfo(20, gfx::Rect(500, 0, 500, 300), 2.0f);
   std::vector<display::ManagedDisplayInfo> display_info_list;
   display_info_list.push_back(display_info1);
   display_info_list.push_back(display_info2);
   display_manager->OnNativeDisplaysChanged(display_info_list);
 
   MoveMouseSync(Shell::GetAllRootWindows()[0], 10, 10);
   EXPECT_EQ(1.0f, test_api.GetCurrentCursor().device_scale_factor());
 
   MoveMouseSync(Shell::GetAllRootWindows()[0], 600, 10);
   EXPECT_EQ(2.0f, test_api.GetCurrentCursor().device_scale_factor());
 }
 
 }  // namespace ash