Replace WM shadow types (on/off) and styles (small/inactive/active)

ui/wm/core/shadow_controller_unittest.cc

Index: ui/wm/core/shadow_controller_unittest.cc
diff --git a/ui/wm/core/shadow_controller_unittest.cc b/ui/wm/core/shadow_controller_unittest.cc
index a560985a0279ecab4b149cc402e182c880b4d8ea..f7e3b736b54409ba3e16fd28421d6ea55c77ae34 100644
--- a/ui/wm/core/shadow_controller_unittest.cc
+++ b/ui/wm/core/shadow_controller_unittest.cc
@@ -76,10 +76,10 @@ TEST_F(ShadowControllerTest, Shadow) {
   EXPECT_TRUE(shadow->layer()->visible());
 
   // If the shadow is disabled, it should be hidden.
-  SetShadowType(window.get(), SHADOW_TYPE_NONE);
+  SetShadowElevation(window.get(), ShadowElevation::NONE);
   window->Show();
   EXPECT_FALSE(shadow->layer()->visible());
-  SetShadowType(window.get(), SHADOW_TYPE_RECTANGULAR);
+  SetShadowElevation(window.get(), ShadowElevation::MEDIUM);
   EXPECT_TRUE(shadow->layer()->visible());
 
   // The shadow's layer should be a child of the window's layer.
@@ -99,7 +99,7 @@ TEST_F(ShadowControllerTest, ShadowBounds) {
 
   // When the shadow is first created, it should use the window's size (but
   // remain at the origin, since it's a child of the window's layer).
-  SetShadowType(window.get(), SHADOW_TYPE_RECTANGULAR);
+  SetShadowElevation(window.get(), ShadowElevation::MEDIUM);
   const Shadow* shadow = ShadowController::GetShadowForWindow(window.get());
   ASSERT_TRUE(shadow != NULL);
   EXPECT_EQ(gfx::Rect(kOldBounds.size()).ToString(),
@@ -125,7 +125,7 @@ TEST_F(ShadowControllerTest, ShadowStyle) {
   // window1 is active, so style should have active appearance.
   Shadow* shadow1 = ShadowController::GetShadowForWindow(window1.get());
   ASSERT_TRUE(shadow1 != NULL);
-  EXPECT_EQ(Shadow::STYLE_ACTIVE, shadow1->style());
+  EXPECT_EQ(ShadowElevation::LARGE, shadow1->desired_elevation());
 
   // Create another window and activate it.
   std::unique_ptr<aura::Window> window2(new aura::Window(NULL));
@@ -139,8 +139,8 @@ TEST_F(ShadowControllerTest, ShadowStyle) {
   // window1 is now inactive, so shadow should go inactive.
   Shadow* shadow2 = ShadowController::GetShadowForWindow(window2.get());
   ASSERT_TRUE(shadow2 != NULL);
-  EXPECT_EQ(Shadow::STYLE_INACTIVE, shadow1->style());
-  EXPECT_EQ(Shadow::STYLE_ACTIVE, shadow2->style());
+  EXPECT_EQ(ShadowElevation::MEDIUM, shadow1->desired_elevation());
+  EXPECT_EQ(ShadowElevation::LARGE, shadow2->desired_elevation());
 }
 
 // Tests that shadow gets updated when the window show state changes.
@@ -153,7 +153,7 @@ TEST_F(ShadowControllerTest, ShowState) {
 
   Shadow* shadow = ShadowController::GetShadowForWindow(window.get());
   ASSERT_TRUE(shadow != NULL);
-  EXPECT_EQ(Shadow::STYLE_INACTIVE, shadow->style());
+  EXPECT_EQ(ShadowElevation::MEDIUM, shadow->desired_elevation());
 
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
   EXPECT_FALSE(shadow->layer()->visible());
@@ -177,7 +177,7 @@ TEST_F(ShadowControllerTest, SmallShadowsForTooltipsAndMenus) {
   Shadow* tooltip_shadow =
       ShadowController::GetShadowForWindow(tooltip_window.get());
   ASSERT_TRUE(tooltip_shadow != NULL);
-  EXPECT_EQ(Shadow::STYLE_SMALL, tooltip_shadow->style());
+  EXPECT_EQ(ShadowElevation::SMALL, tooltip_shadow->desired_elevation());
 
   std::unique_ptr<aura::Window> menu_window(new aura::Window(NULL));
   menu_window->SetType(ui::wm::WINDOW_TYPE_MENU);
@@ -189,7 +189,7 @@ TEST_F(ShadowControllerTest, SmallShadowsForTooltipsAndMenus) {
   Shadow* menu_shadow =
       ShadowController::GetShadowForWindow(tooltip_window.get());
   ASSERT_TRUE(menu_shadow != NULL);
-  EXPECT_EQ(Shadow::STYLE_SMALL, menu_shadow->style());
+  EXPECT_EQ(ShadowElevation::SMALL, menu_shadow->desired_elevation());
 }
 
 // http://crbug.com/120210 - transient parents of certain types of transients
@@ -206,7 +206,7 @@ TEST_F(ShadowControllerTest, TransientParentKeepsActiveShadow) {
   // window1 is active, so style should have active appearance.
   Shadow* shadow1 = ShadowController::GetShadowForWindow(window1.get());
   ASSERT_TRUE(shadow1 != NULL);
-  EXPECT_EQ(Shadow::STYLE_ACTIVE, shadow1->style());
+  EXPECT_EQ(ShadowElevation::LARGE, shadow1->desired_elevation());
 
   // Create a window that is transient to window1, and that has the 'hide on
   // deactivate' property set. Upon activation, window1 should still have an
@@ -222,7 +222,7 @@ TEST_F(ShadowControllerTest, TransientParentKeepsActiveShadow) {
   ActivateWindow(window2.get());
 
   // window1 is now inactive, but its shadow should still appear active.
-  EXPECT_EQ(Shadow::STYLE_ACTIVE, shadow1->style());
+  EXPECT_EQ(ShadowElevation::LARGE, shadow1->desired_elevation());
 }
 
 }  // namespace wm