Makes Window::Init take a WindowLayerType instead of LayerType.

ui/views/corewm/shadow_controller_unittest.cc

Index: ui/views/corewm/shadow_controller_unittest.cc
diff --git a/ui/views/corewm/shadow_controller_unittest.cc b/ui/views/corewm/shadow_controller_unittest.cc
index a01237a9786a28d148d3367225d2c6277ceb5709..b0d5f14612d95a55fa0382e576bf1e3de845ed65 100644
--- a/ui/views/corewm/shadow_controller_unittest.cc
+++ b/ui/views/corewm/shadow_controller_unittest.cc
@@ -61,7 +61,7 @@ class ShadowControllerTest : public aura::test::AuraTestBase {
 TEST_F(ShadowControllerTest, Shadow) {
   scoped_ptr<aura::Window> window(new aura::Window(NULL));
   window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
-  window->Init(ui::LAYER_TEXTURED);
+  window->Init(aura::WINDOW_LAYER_TEXTURED);
   ParentWindow(window.get());
 
   // We should create the shadow before the window is visible (the shadow's
@@ -97,7 +97,7 @@ TEST_F(ShadowControllerTest, Shadow) {
 TEST_F(ShadowControllerTest, ShadowBounds) {
   scoped_ptr<aura::Window> window(new aura::Window(NULL));
   window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
-  window->Init(ui::LAYER_TEXTURED);
+  window->Init(aura::WINDOW_LAYER_TEXTURED);
   ParentWindow(window.get());
   window->Show();
 
@@ -126,7 +126,7 @@ TEST_F(ShadowControllerTest, ShadowStyle) {
 
   scoped_ptr<aura::Window> window1(new aura::Window(NULL));
   window1->SetType(ui::wm::WINDOW_TYPE_NORMAL);
-  window1->Init(ui::LAYER_TEXTURED);
+  window1->Init(aura::WINDOW_LAYER_TEXTURED);
   ParentWindow(window1.get());
   window1->SetBounds(gfx::Rect(10, 20, 300, 400));
   window1->Show();
@@ -140,7 +140,7 @@ TEST_F(ShadowControllerTest, ShadowStyle) {
   // Create another window and activate it.
   scoped_ptr<aura::Window> window2(new aura::Window(NULL));
   window2->SetType(ui::wm::WINDOW_TYPE_NORMAL);
-  window2->Init(ui::LAYER_TEXTURED);
+  window2->Init(aura::WINDOW_LAYER_TEXTURED);
   ParentWindow(window2.get());
   window2->SetBounds(gfx::Rect(11, 21, 301, 401));
   window2->Show();
@@ -159,7 +159,7 @@ TEST_F(ShadowControllerTest, SmallShadowsForTooltipsAndMenus) {
 
   scoped_ptr<aura::Window> tooltip_window(new aura::Window(NULL));
   tooltip_window->SetType(ui::wm::WINDOW_TYPE_TOOLTIP);
-  tooltip_window->Init(ui::LAYER_TEXTURED);
+  tooltip_window->Init(aura::WINDOW_LAYER_TEXTURED);
   ParentWindow(tooltip_window.get());
   tooltip_window->SetBounds(gfx::Rect(10, 20, 300, 400));
   tooltip_window->Show();
@@ -170,7 +170,7 @@ TEST_F(ShadowControllerTest, SmallShadowsForTooltipsAndMenus) {
 
   scoped_ptr<aura::Window> menu_window(new aura::Window(NULL));
   menu_window->SetType(ui::wm::WINDOW_TYPE_MENU);
-  menu_window->Init(ui::LAYER_TEXTURED);
+  menu_window->Init(aura::WINDOW_LAYER_TEXTURED);
   ParentWindow(menu_window.get());
   menu_window->SetBounds(gfx::Rect(10, 20, 300, 400));
   menu_window->Show();
@@ -187,7 +187,7 @@ TEST_F(ShadowControllerTest, TransientParentKeepsActiveShadow) {
 
   scoped_ptr<aura::Window> window1(new aura::Window(NULL));
   window1->SetType(ui::wm::WINDOW_TYPE_NORMAL);
-  window1->Init(ui::LAYER_TEXTURED);
+  window1->Init(aura::WINDOW_LAYER_TEXTURED);
   ParentWindow(window1.get());
   window1->SetBounds(gfx::Rect(10, 20, 300, 400));
   window1->Show();
@@ -203,7 +203,7 @@ TEST_F(ShadowControllerTest, TransientParentKeepsActiveShadow) {
   // active shadow.
   scoped_ptr<aura::Window> window2(new aura::Window(NULL));
   window2->SetType(ui::wm::WINDOW_TYPE_NORMAL);
-  window2->Init(ui::LAYER_TEXTURED);
+  window2->Init(aura::WINDOW_LAYER_TEXTURED);
   ParentWindow(window2.get());
   window2->SetBounds(gfx::Rect(11, 21, 301, 401));
   AddTransientChild(window1.get(), window2.get());