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

ash/wm/stacking_controller_unittest.cc

 // Copyright (c) 2012 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/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/views/corewm/window_util.h"
 
 using aura::Window;
 
 namespace ash {
 namespace internal {
 
 class StackingControllerTest : public test::AshTestBase {
  public:
   StackingControllerTest() {}
   virtual ~StackingControllerTest() {}
 
   aura::Window* CreateTestWindow() {
     aura::Window* window = new aura::Window(NULL);
     window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
     window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
-    window->Init(ui::LAYER_TEXTURED);
+    window->Init(aura::WINDOW_LAYER_TEXTURED);
     return window;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(StackingControllerTest);
 };
 
 // Verifies a window with a transient parent is in the same container as its
 // transient parent.
 TEST_F(StackingControllerTest, TransientParent) {
@@ skipping 15 matching lines @@
   w1->Show();
   wm::ActivateWindow(w1.get());
 
   // The window with the transient parent should get added to the same container
   // as its transient parent.
   EXPECT_EQ(launcher, w1->parent());
 }
 
 }  // namespace internal
 }  // namespace ash