[Cleanup] Rename WindowSettings to WindowState

ash/accelerators/accelerator_commands_unittest.cc

Index: ash/accelerators/accelerator_commands_unittest.cc
diff --git a/ash/accelerators/accelerator_commands_unittest.cc b/ash/accelerators/accelerator_commands_unittest.cc
index 7d75cb89aee3b8ba6d11fa3d6b213387f529429e..2423bb52c4ca37331519ff165d0f4bb7f8950707 100644
--- a/ash/accelerators/accelerator_commands_unittest.cc
+++ b/ash/accelerators/accelerator_commands_unittest.cc
@@ -5,7 +5,7 @@
 #include "ash/accelerators/accelerator_commands.h"
 
 #include "ash/test/ash_test_base.h"
-#include "ash/wm/window_util.h"
+#include "ash/wm/window_state.h"
 #include "ui/aura/window.h"
 
 namespace ash {
@@ -16,15 +16,16 @@ typedef test::AshTestBase AcceleratorCommandsTest;
 TEST_F(AcceleratorCommandsTest, ToggleMinimized) {
   scoped_ptr<aura::Window> window(
       CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
-  wm::ActivateWindow(window.get());
+  wm::WindowState* window_state = wm::GetWindowState(window.get());
+  window_state->Activate();
 
   ToggleMinimized();
-  EXPECT_TRUE(wm::IsWindowMinimized(window.get()));
-  EXPECT_FALSE(wm::IsWindowNormal(window.get()));
+  EXPECT_TRUE(window_state->IsMinimized());
+  EXPECT_FALSE(window_state->IsNormalShowState());
 
   ToggleMinimized();
-  EXPECT_FALSE(wm::IsWindowMinimized(window.get()));
-  EXPECT_TRUE(wm::IsWindowNormal(window.get()));
+  EXPECT_FALSE(window_state->IsMinimized());
+  EXPECT_TRUE(window_state->IsNormalShowState());
 }
 
 }  // namespace accelerators