chromeos: moves more ash tests to run on mash

ash/wm/immersive_fullscreen_controller_unittest.cc

Index: ash/wm/immersive_fullscreen_controller_unittest.cc
diff --git a/ash/wm/immersive_fullscreen_controller_unittest.cc b/ash/wm/immersive_fullscreen_controller_unittest.cc
index a9665e5fddb555b4d133635f86933275d85bf773..cfb4f1c6295b46325a5be13348d85cda2eb456fd 100644
--- a/ash/wm/immersive_fullscreen_controller_unittest.cc
+++ b/ash/wm/immersive_fullscreen_controller_unittest.cc
@@ -6,6 +6,7 @@
 
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/wm/window_state.h"
+#include "ash/common/wm_shell.h"
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/root_window_controller.h"
@@ -260,6 +261,10 @@ class ImmersiveFullscreenControllerTest : public ash::test::AshTestBase {
 // Test the initial state and that the delegate gets notified of the
 // top-of-window views getting hidden and revealed.
 TEST_F(ImmersiveFullscreenControllerTest, Delegate) {
+  // TODO: investigate failure. http://crbug.com/698085.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   // Initial state.
   EXPECT_FALSE(controller()->IsEnabled());
   EXPECT_FALSE(controller()->IsRevealed());
@@ -340,6 +345,10 @@ TEST_F(ImmersiveFullscreenControllerTest, RevealedLock) {
 
 // Test mouse event processing for top-of-screen reveal triggering.
 TEST_F(ImmersiveFullscreenControllerTest, OnMouseEvent) {
+  // TODO: investigate failure. http://crbug.com/698085.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   // Set up initial state.
   SetEnabled(true);
   ASSERT_TRUE(controller()->IsEnabled());
@@ -440,6 +449,10 @@ TEST_F(ImmersiveFullscreenControllerTest, OnMouseEvent) {
 // Test mouse event processing for top-of-screen reveal triggering when the
 // top container's widget is inactive.
 TEST_F(ImmersiveFullscreenControllerTest, Inactive) {
+  // TODO: investigate failure. http://crbug.com/698085.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   // Set up initial state.
   views::Widget* popup_widget = views::Widget::CreateWindowWithContextAndBounds(
       nullptr, CurrentContext(), gfx::Rect(0, 0, 200, 200));
@@ -496,6 +509,11 @@ TEST_F(ImmersiveFullscreenControllerTest, Inactive) {
 // has a vertical display layout (primary display above/below secondary display)
 // and the immersive fullscreen window is on the bottom display.
 TEST_F(ImmersiveFullscreenControllerTest, MouseEventsVerticalDisplayLayout) {
+  // TODO: SetLayoutForCurrentDisplays() needs to ported to mash.
+  // http://crbug.com/698043.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   // Set up initial state.
   UpdateDisplay("800x600,800x600");
   ash::Shell::GetInstance()->display_manager()->SetLayoutForCurrentDisplays(
@@ -578,6 +596,10 @@ TEST_F(ImmersiveFullscreenControllerTest, MouseEventsVerticalDisplayLayout) {
 
 // Test behavior when the mouse becomes hovered without moving.
 TEST_F(ImmersiveFullscreenControllerTest, MouseHoveredWithoutMoving) {
+  // TODO: investigate failure. http://crbug.com/698085.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   SetEnabled(true);
   std::unique_ptr<ImmersiveRevealedLock> lock;
 
@@ -627,6 +649,10 @@ TEST_F(ImmersiveFullscreenControllerTest, MouseHoveredWithoutMoving) {
 // edge gesture, switching to using the mouse and ending the reveal by moving
 // the mouse off of the top-of-window views.
 TEST_F(ImmersiveFullscreenControllerTest, DifferentModalityEnterExit) {
+  // TODO: investigate failure. http://crbug.com/698085.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   SetEnabled(true);
   EXPECT_TRUE(controller()->IsEnabled());
   EXPECT_FALSE(controller()->IsRevealed());
@@ -660,6 +686,10 @@ TEST_F(ImmersiveFullscreenControllerTest, DifferentModalityEnterExit) {
 
 // Test when the SWIPE_CLOSE edge gesture closes the top-of-window views.
 TEST_F(ImmersiveFullscreenControllerTest, EndRevealViaGesture) {
+  // TODO: investigate failure. http://crbug.com/698085.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   SetEnabled(true);
   EXPECT_TRUE(controller()->IsEnabled());
   EXPECT_FALSE(controller()->IsRevealed());
@@ -692,6 +722,10 @@ TEST_F(ImmersiveFullscreenControllerTest, EndRevealViaGesture) {
 // Tests that touch-gesture can be used to reveal the top-of-window views when
 // the child window consumes all events.
 TEST_F(ImmersiveFullscreenControllerTest, RevealViaGestureChildConsumesEvents) {
+  // TODO: investigate failure. http://crbug.com/698085.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   // Enabling initially hides the top views.
   SetEnabled(true);
   EXPECT_TRUE(controller()->IsEnabled());
@@ -768,6 +802,10 @@ TEST_F(ImmersiveFullscreenControllerTest, WindowStateImmersiveFullscreen) {
 // Test how focus and activation affects whether the top-of-window views are
 // revealed.
 TEST_F(ImmersiveFullscreenControllerTest, Focus) {
+  // TODO: investigate failure. http://crbug.com/698085.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   // Add views to the view hierarchy which we will focus and unfocus during the
   // test.
   views::View* child_view = new views::View();
@@ -833,6 +871,10 @@ TEST_F(ImmersiveFullscreenControllerTest, Focus) {
 // Test how transient windows affect whether the top-of-window views are
 // revealed.
 TEST_F(ImmersiveFullscreenControllerTest, Transient) {
+  // TODO: investigate failure. http://crbug.com/698085.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   views::Widget* top_container_widget = top_container()->GetWidget();
 
   SetEnabled(true);
@@ -878,6 +920,10 @@ TEST_F(ImmersiveFullscreenControllerTest, Transient) {
 
 // Test how bubbles affect whether the top-of-window views are revealed.
 TEST_F(ImmersiveFullscreenControllerTest, Bubbles) {
+  // TODO: investigate failure. http://crbug.com/698085.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   std::unique_ptr<ImmersiveRevealedLock> revealed_lock;
   views::Widget* top_container_widget = top_container()->GetWidget();