Remove WindowState::IsNormalShowState()

ash/wm/resize_shadow_and_cursor_unittest.cc

Index: ash/wm/resize_shadow_and_cursor_unittest.cc
diff --git a/ash/wm/resize_shadow_and_cursor_unittest.cc b/ash/wm/resize_shadow_and_cursor_unittest.cc
index 804bb3b074c208882f3b58e67d65d3c90eeed3f9..f3ca4ba26d02e46bd9fd223cc3ebe53350b6d576 100644
--- a/ash/wm/resize_shadow_and_cursor_unittest.cc
+++ b/ash/wm/resize_shadow_and_cursor_unittest.cc
@@ -117,7 +117,7 @@ class ResizeShadowAndCursorTest : public AshTestBase {
 // mouse's position.
 TEST_F(ResizeShadowAndCursorTest, MouseHover) {
   aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
-  ASSERT_TRUE(ash::wm::GetWindowState(window())->IsNormalShowState());
+  ASSERT_TRUE(ash::wm::GetWindowState(window())->IsNormalShowType());
 
   generator.MoveMouseTo(50, 50);
   EXPECT_FALSE(HasResizeShadow());
@@ -160,7 +160,7 @@ TEST_F(ResizeShadowAndCursorTest, MouseHover) {
 // as long as a user is resizing a window.
 TEST_F(ResizeShadowAndCursorTest, MouseDrag) {
   aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
-  ASSERT_TRUE(ash::wm::GetWindowState(window())->IsNormalShowState());
+  ASSERT_TRUE(ash::wm::GetWindowState(window())->IsNormalShowType());
   gfx::Size initial_size(window()->bounds().size());
 
   generator.MoveMouseTo(100, 50);
@@ -182,7 +182,7 @@ TEST_F(ResizeShadowAndCursorTest, MouseDrag) {
 
 // Test that the resize shadows stay visible while resizing a window via touch.
 TEST_F(ResizeShadowAndCursorTest, Touch) {
-  ASSERT_TRUE(ash::wm::GetWindowState(window())->IsNormalShowState());
+  ASSERT_TRUE(ash::wm::GetWindowState(window())->IsNormalShowType());
   aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
 
   int start = 100 + ash::kResizeOutsideBoundsSize - 1;
@@ -199,7 +199,7 @@ TEST_F(ResizeShadowAndCursorTest, Touch) {
 // used when the window is maximized.
 TEST_F(ResizeShadowAndCursorTest, MaximizeRestore) {
   aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
-  ASSERT_TRUE(ash::wm::GetWindowState(window())->IsNormalShowState());
+  ASSERT_TRUE(ash::wm::GetWindowState(window())->IsNormalShowType());
 
   generator.MoveMouseTo(100, 50);
   EXPECT_EQ(HTRIGHT, ResizeShadowHitTest());