Fixing problem with edge swipe exiting immersive mode

chrome/browser/ui/views/frame/immersive_mode_controller_ash_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 "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h"
 
 #include "ash/ash_switches.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 "base/command_line.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
 #include "chrome/browser/ui/fullscreen/fullscreen_controller_test.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/test_with_browser_view.h"
 #include "chrome/browser/ui/views/frame/top_container_view.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
@@ skipping 232 matching lines @@
   // 3) Test that exiting tab fullscreen and immersive fullscreen
   // simultaneously correctly updates the shelf visibility and whether the tab
   // indicators should be hidden.
   SetTabFullscreen(true);
   ToggleFullscreen();
   ASSERT_FALSE(controller()->IsEnabled());
   EXPECT_EQ(ash::SHELF_VISIBLE, shelf->visibility_state());
   EXPECT_TRUE(controller()->ShouldHideTabIndicators());
 }
 
+// Check that the window state gets properly marked for immersive mode.
+TEST_F(ImmersiveModeControllerAshTest, WindowStateImmersiveModeFullscreen) {
+  AddTab(browser(), GURL("about:blank"));
+
+  ash::wm::WindowState* window_state =
+      ash::wm::GetWindowState(browser()->window()->GetNativeWindow());
+
+  EXPECT_FALSE(window_state->immersive_mode());
+  ToggleFullscreen();
+  ASSERT_TRUE(controller()->IsEnabled());
+  EXPECT_TRUE(window_state->immersive_mode());
+
+  ToggleFullscreen();
+  ASSERT_FALSE(controller()->IsEnabled());
+  EXPECT_FALSE(window_state->immersive_mode());
+}
+
 class ImmersiveModeControllerAshTestHostedApp
     : public ImmersiveModeControllerAshTest {
  public:
   ImmersiveModeControllerAshTestHostedApp()
       : ImmersiveModeControllerAshTest(Browser::TYPE_POPUP,
                                        chrome::HOST_DESKTOP_TYPE_ASH,
                                        true) {
   }
   virtual ~ImmersiveModeControllerAshTestHostedApp() {}
 
@@ skipping 54 matching lines @@
 
   // Exit immersive fullscreen. The web contents should be back below the window
   // header.
   ToggleFullscreen();
   EXPECT_FALSE(browser_view()->GetWidget()->IsFullscreen());
   EXPECT_FALSE(controller()->IsEnabled());
   EXPECT_FALSE(tabstrip->visible());
   EXPECT_FALSE(toolbar->visible());
   EXPECT_EQ(header_height, GetBoundsInWidget(contents_web_view).y());
 }