[Cleanup] Rename WindowSettings to WindowState

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/native_app_window.h"
 #include "apps/shell_window.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_util.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/browser/ui/immersive_fullscreen_configuration.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "ui/aura/client/aura_constants.h"
 
@@ skipping 12 matching lines @@
 }
 
 }  // namespace
 
 typedef InProcessBrowserTest ChromeShellDelegateBrowserTest;
 
 // Confirm that toggling window miximized works properly
 IN_PROC_BROWSER_TEST_F(ChromeShellDelegateBrowserTest, ToggleMaximized) {
   ash::ShellDelegate* shell_delegate = ash::Shell::GetInstance()->delegate();
   ASSERT_TRUE(shell_delegate);
-  aura::Window* window = ash::wm::GetActiveWindow();
-  ASSERT_TRUE(window);
+  ash::wm::WindowState* window_state = ash::wm::GetActiveWindowState();
+  ASSERT_TRUE(window_state);
 
   // When not in fullscreen, ShellDelegate::ToggleMaximized toggles Maximized.
-  EXPECT_FALSE(ash::wm::IsWindowMaximized(window));
+  EXPECT_FALSE(window_state->IsMaximized());
   shell_delegate->ToggleMaximized();
-  EXPECT_TRUE(ash::wm::IsWindowMaximized(window));
+  EXPECT_TRUE(window_state->IsMaximized());
   shell_delegate->ToggleMaximized();
-  EXPECT_FALSE(ash::wm::IsWindowMaximized(window));
+  EXPECT_FALSE(window_state->IsMaximized());
 
   // When in fullscreen ShellDelegate::ToggleMaximized gets out of fullscreen.
-  EXPECT_FALSE(ash::wm::IsWindowFullscreen(window));
-  Browser* browser = chrome::FindBrowserWithWindow(window);
+  EXPECT_FALSE(window_state->IsFullscreen());
+  Browser* browser = chrome::FindBrowserWithWindow(window_state->window());
   ASSERT_TRUE(browser);
   chrome::ToggleFullscreenMode(browser);
-  EXPECT_TRUE(ash::wm::IsWindowFullscreen(window));
+  EXPECT_TRUE(window_state->IsFullscreen());
   shell_delegate->ToggleMaximized();
-  EXPECT_FALSE(ash::wm::IsWindowFullscreen(window));
-  EXPECT_FALSE(ash::wm::IsWindowMaximized(window));
+  EXPECT_FALSE(window_state->IsFullscreen());
+  EXPECT_FALSE(window_state->IsMaximized());
   shell_delegate->ToggleMaximized();
-  EXPECT_FALSE(ash::wm::IsWindowFullscreen(window));
-  EXPECT_TRUE(ash::wm::IsWindowMaximized(window));
+  EXPECT_FALSE(window_state->IsFullscreen());
+  EXPECT_TRUE(window_state->IsMaximized());
 }
 
 // Confirm that toggling window fullscren works properly.
 IN_PROC_BROWSER_TEST_F(ChromeShellDelegateBrowserTest, ToggleFullscreen) {
   ash::ShellDelegate* shell_delegate = ash::Shell::GetInstance()->delegate();
   ASSERT_TRUE(shell_delegate);
 
   // 1) ToggleFullscreen() should toggle whether a tabbed browser window is in
   // immersive fullscreen.
   ASSERT_TRUE(browser()->is_type_tabbed());
@@ skipping 104 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);
 }