[Refactor] Replace kFullscreenUsesMinimalChromeKey with WindowState::hide_shelf_when_fullscreen()

chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc

 // Copyright (c) 2012 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/ash/chrome_shell_delegate.h"
 
 #include "apps/shell_window.h"
 #include "apps/ui/native_app_window.h"
 #include "ash/accelerators/accelerator_commands.h"
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
-#include "ash/wm/window_properties.h"
 #include "ash/wm/window_state.h"
 #include "base/command_line.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "ui/aura/client/aura_constants.h"
 
 namespace {
 
 // Returns true if |window| is in immersive fullscreen. Infer whether |window|
-// is in immersive fullscreen based on whether kFullscreenUsesMinimalChromeKey
-// is set for |window| because DEPS does not allow the test to use BrowserView.
-// (This is not quite right because if a window is in both immersive browser
-// fullscreen and in tab fullscreen, kFullScreenUsesMinimalChromeKey will
-// not be set).
+// is in immersive fullscreen based on whether the shelf is hidden when
+// |window| is fullscreen because DEPS does not allow the test to use
+// BrowserView. (This is not quite right because the shelf is hidden if a window
+// is in both immersive fullscreen and tab fullscreen.)
 bool IsInImmersiveFullscreen(BrowserWindow* browser_window) {
-  return browser_window->IsFullscreen() &&
-      browser_window->GetNativeWindow()->GetProperty(
-          ash::internal::kFullscreenUsesMinimalChromeKey);
+  ash::wm::WindowState* window_state = ash::wm::GetWindowState(
+      browser_window->GetNativeWindow());
+  return window_state->IsFullscreen() &&
+      !window_state->hide_shelf_when_fullscreen();
 }
 
 }  // namespace
 
 typedef InProcessBrowserTest ChromeShellDelegateBrowserTest;
 
 // TODO(oshima): Move these tests to ash once ToggleFullscreen is moved
 // to ash. crbug.com/309837.
 
 // Confirm that toggling window miximized works properly
@@ skipping 138 matching lines @@
 
   shell_delegate->ToggleFullscreen();
   EXPECT_TRUE(app_window->IsFullscreen());
 
   shell_delegate->ToggleFullscreen();
   EXPECT_FALSE(app_window->IsMaximized());
   EXPECT_FALSE(app_window->IsFullscreen());
 
   CloseShellWindow(shell_window);
 }