Fixing problem with edge swipe exiting immersive mode

ash/wm/immersive_fullscreen_controller_unittest.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/immersive_fullscreen_controller.h"
 
 #include "ash/display/display_manager.h"
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
+#include "ash/wm/window_state.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/test/test_event_handler.h"
 #include "ui/gfx/animation/slide_animation.h"
@@ skipping 748 matching lines @@
   EXPECT_FALSE(controller()->IsRevealed());
   // Make sure the windows are still aligned on top.
   EXPECT_EQ(behind->GetBoundsInScreen().y(), window()->GetBoundsInScreen().y());
   top = behind->GetBoundsInScreen().y();
   ui::TouchEvent touch2(ui::ET_TOUCH_MOVED, gfx::Point(10, top), 0,
                         ui::EventTimeForNow());
   // The event should still be targeted to window().
   EXPECT_EQ(window(), targeter->FindTargetForEvent(root, &touch2));
 }
 
+// Check that the window state gets properly marked for immersive mode.

[pkotwicz, 2014/06/02 22:27:58]

Nit: immersive mode -> immersive fullscreen

[Mr4D (OOO till 08-26), 2014/06/03 14:36:40]

Somehow that is odd since there are several files naming it immersive mode.
(maybe they should be changed as well?)

Done.

+TEST_F(ImmersiveFullscreenControllerTest, WindowStateImmersiveModeFullscreen) {
+  ash::wm::WindowState* window_state = ash::wm::GetWindowState(window());
+
+  EXPECT_FALSE(window_state->in_immersive_fullscreen());
+  SetEnabled(true);
+  ASSERT_TRUE(controller()->IsEnabled());
+  EXPECT_TRUE(window_state->in_immersive_fullscreen());
+
+  SetEnabled(false);
+  ASSERT_FALSE(controller()->IsEnabled());
+  EXPECT_FALSE(window_state->in_immersive_fullscreen());
+}
+
 // Do not test under windows because focus testing is not reliable on
 // Windows. (crbug.com/79493)
 #if !defined(OS_WIN)
 
 // Test how focus and activation affects whether the top-of-window views are
 // revealed.
 TEST_F(ImmersiveFullscreenControllerTest, Focus) {
   // Add views to the view hierarchy which we will focus and unfocus during the
   // test.
   views::View* child_view = new views::View();
@@ skipping 261 matching lines @@
   EXPECT_EQ(ash::SHELF_AUTO_HIDE, shelf->visibility_state());
 
   // Disabling immersive fullscreen maintains the user's auto-hide selection.
   SetEnabled(false);
   window()->SetProperty(aura::client::kShowStateKey,
                         ui::SHOW_STATE_NORMAL);
   EXPECT_EQ(ash::SHELF_AUTO_HIDE, shelf->visibility_state());
 }
 
 }  // namespase ash