Remove WindowState::IsNormalShowState()

ash/wm/caption_buttons/alternate_frame_size_button_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 "ash/wm/caption_buttons/alternate_frame_size_button.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/caption_buttons/frame_caption_button.h"
@@ skipping 193 matching lines @@
   EXPECT_TRUE(window_state()->IsMaximized());
 
   generator.GestureTapAt(CenterPointInScreen(size_button()));
   RunAllPendingInMessageLoop();
   EXPECT_FALSE(window_state()->IsMaximized());
 }
 
 // Test that clicking + dragging to a button adjacent to the size button snaps
 // the window left or right.
 TEST_F(AlternateFrameSizeButtonTest, ButtonDrag) {
-  EXPECT_TRUE(window_state()->IsNormalShowState());
-  EXPECT_FALSE(window_state()->IsSnapped());
+  EXPECT_TRUE(window_state()->IsNormalShowType());
 
   // 1) Test by dragging the mouse.
   // Snap right.
   aura::test::EventGenerator& generator = GetEventGenerator();
   generator.MoveMouseTo(CenterPointInScreen(size_button()));
   generator.PressLeftButton();
   generator.MoveMouseTo(CenterPointInScreen(close_button()));
   generator.ReleaseLeftButton();
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(IsSnapped(internal::SnapSizer::RIGHT_EDGE));
@@ skipping 38 matching lines @@
   generator.MoveMouseTo(CenterPointInScreen(size_button()));
   generator.PressMoveAndReleaseTouchTo(CenterPointInScreen(minimize_button()));
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(IsSnapped(internal::SnapSizer::LEFT_EDGE));
   ui::GestureConfiguration::set_default_radius(touch_default_radius);
 }
 
 // Test that clicking, dragging, and overshooting the minimize button a bit
 // horizontally still snaps the window left.
 TEST_F(AlternateFrameSizeButtonTest, SnapLeftOvershootMinimize) {
-  EXPECT_TRUE(window_state()->IsNormalShowState());
-  EXPECT_FALSE(window_state()->IsSnapped());
+  EXPECT_TRUE(window_state()->IsNormalShowType());
 
   aura::test::EventGenerator& generator = GetEventGenerator();
   generator.MoveMouseTo(CenterPointInScreen(size_button()));
 
   generator.PressLeftButton();
   // Move to the minimize button.
   generator.MoveMouseTo(CenterPointInScreen(minimize_button()));
   // Overshoot the minimize button.
   generator.MoveMouseBy(-minimize_button()->width(), 0);
   generator.ReleaseLeftButton();
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(IsSnapped(internal::SnapSizer::LEFT_EDGE));
 }
 
 // Test that right clicking the size button has no effect.
 TEST_F(AlternateFrameSizeButtonTest, RightMouseButton) {
-  EXPECT_TRUE(window_state()->IsNormalShowState());
-  EXPECT_FALSE(window_state()->IsSnapped());
+  EXPECT_TRUE(window_state()->IsNormalShowType());
 
   aura::test::EventGenerator& generator = GetEventGenerator();
   generator.MoveMouseTo(CenterPointInScreen(size_button()));
   generator.PressRightButton();
   generator.ReleaseRightButton();
   RunAllPendingInMessageLoop();
-  EXPECT_TRUE(window_state()->IsNormalShowState());
-  EXPECT_FALSE(window_state()->IsSnapped());
+  EXPECT_TRUE(window_state()->IsNormalShowType());
 }
 
 // Test that upon releasing the mouse button after having pressed the size
 // button
 // - The state of all the caption buttons is reset.
 // - The icon displayed by all of the caption buttons is reset.
 TEST_F(AlternateFrameSizeButtonTest, ResetButtonsAfterClick) {
   EXPECT_EQ(CAPTION_BUTTON_ICON_MINIMIZE, minimize_button()->icon());
   EXPECT_EQ(CAPTION_BUTTON_ICON_CLOSE, close_button()->icon());
   EXPECT_TRUE(AllButtonsInNormalState());
@@ skipping 95 matching lines @@
   generator.MoveMouseTo(kWorkAreaBoundsInScreen.bottom_left());
   EXPECT_TRUE(AllButtonsInNormalState());
   generator.MoveMouseTo(CenterPointInScreen(close_button()));
   EXPECT_EQ(views::Button::STATE_NORMAL, minimize_button()->state());
   EXPECT_EQ(views::Button::STATE_PRESSED, size_button()->state());
   EXPECT_EQ(views::Button::STATE_HOVERED, close_button()->state());
 }
 
 }  // namespace test
 }  // namespace ash