aura: Remove layerless windows.

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 516b92d00a47061ca7b891c8dae6bc873c682105..7429e38f0d423874e811a0357ee0ce095503fae8 100644
--- a/ui/wm/core/shadow_controller_unittest.cc
+++ b/ui/wm/core/shadow_controller_unittest.cc
@@ -63,7 +63,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(aura::WINDOW_LAYER_TEXTURED);
+  window->Init(ui::LAYER_TEXTURED);
   ParentWindow(window.get());
 
   // We should create the shadow before the window is visible (the shadow's
@@ -99,7 +99,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(aura::WINDOW_LAYER_TEXTURED);
+  window->Init(ui::LAYER_TEXTURED);
   ParentWindow(window.get());
   window->Show();
 
@@ -128,7 +128,7 @@ TEST_F(ShadowControllerTest, ShadowStyle) {
 
   scoped_ptr<aura::Window> window1(new aura::Window(NULL));
   window1->SetType(ui::wm::WINDOW_TYPE_NORMAL);
-  window1->Init(aura::WINDOW_LAYER_TEXTURED);
+  window1->Init(ui::LAYER_TEXTURED);
   ParentWindow(window1.get());
   window1->SetBounds(gfx::Rect(10, 20, 300, 400));
   window1->Show();
@@ -142,7 +142,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(aura::WINDOW_LAYER_TEXTURED);
+  window2->Init(ui::LAYER_TEXTURED);
   ParentWindow(window2.get());
   window2->SetBounds(gfx::Rect(11, 21, 301, 401));
   window2->Show();
@@ -161,7 +161,7 @@ TEST_F(ShadowControllerTest, ShowState) {
 
   scoped_ptr<aura::Window> window(new aura::Window(NULL));
   window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
-  window->Init(aura::WINDOW_LAYER_TEXTURED);
+  window->Init(ui::LAYER_TEXTURED);
   ParentWindow(window.get());
   window->Show();
 
@@ -185,7 +185,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(aura::WINDOW_LAYER_TEXTURED);
+  tooltip_window->Init(ui::LAYER_TEXTURED);
   ParentWindow(tooltip_window.get());
   tooltip_window->SetBounds(gfx::Rect(10, 20, 300, 400));
   tooltip_window->Show();
@@ -196,7 +196,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(aura::WINDOW_LAYER_TEXTURED);
+  menu_window->Init(ui::LAYER_TEXTURED);
   ParentWindow(menu_window.get());
   menu_window->SetBounds(gfx::Rect(10, 20, 300, 400));
   menu_window->Show();
@@ -213,7 +213,7 @@ TEST_F(ShadowControllerTest, TransientParentKeepsActiveShadow) {
 
   scoped_ptr<aura::Window> window1(new aura::Window(NULL));
   window1->SetType(ui::wm::WINDOW_TYPE_NORMAL);
-  window1->Init(aura::WINDOW_LAYER_TEXTURED);
+  window1->Init(ui::LAYER_TEXTURED);
   ParentWindow(window1.get());
   window1->SetBounds(gfx::Rect(10, 20, 300, 400));
   window1->Show();
@@ -229,7 +229,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(aura::WINDOW_LAYER_TEXTURED);
+  window2->Init(ui::LAYER_TEXTURED);
   ParentWindow(window2.get());
   window2->SetBounds(gfx::Rect(11, 21, 301, 401));
   AddTransientChild(window1.get(), window2.get());