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

ash/wm/toplevel_window_event_handler_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/wm/toplevel_window_event_handler.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 51 matching lines @@
  public:
   ToplevelWindowEventHandlerTest() {}
   virtual ~ToplevelWindowEventHandlerTest() {}
 
  protected:
   aura::Window* CreateWindow(int hittest_code) {
     TestWindowDelegate* d1 = new TestWindowDelegate(hittest_code);
     aura::Window* w1 = new aura::Window(d1);
     w1->SetType(ui::wm::WINDOW_TYPE_NORMAL);
     w1->set_id(1);
-    w1->Init(ui::LAYER_TEXTURED);
+    w1->Init(aura::WINDOW_LAYER_TEXTURED);
     aura::Window* parent =
       Shell::GetContainer(Shell::GetPrimaryRootWindow(),
                           internal::kShellWindowId_AlwaysOnTopContainer);
     parent->AddChild(w1);
     w1->SetBounds(gfx::Rect(0, 0, 100, 100));
     w1->Show();
     return w1;
   }
 
   void DragFromCenterBy(aura::Window* window, int dx, int dy) {
@@ skipping 630 matching lines @@
   move_client->RunMoveLoop(window2.get(), gfx::Vector2d(),
       aura::client::WINDOW_MOVE_SOURCE_MOUSE);
   EXPECT_EQ(window1_initial_bounds.ToString(), window1->bounds().ToString());
 }
 
 // Showing the resize shadows when the mouse is over the window edges is tested
 // in resize_shadow_and_cursor_test.cc
 
 }  // namespace test
 }  // namespace ash