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

ui/keyboard/keyboard_controller_unittest.cc

Index: ui/keyboard/keyboard_controller_unittest.cc
diff --git a/ui/keyboard/keyboard_controller_unittest.cc b/ui/keyboard/keyboard_controller_unittest.cc
index d79c9ba3d8220008bc148121eb79cacaf014ad4d..80296f0a98a33676a60a198faa16282bdd374e41 100644
--- a/ui/keyboard/keyboard_controller_unittest.cc
+++ b/ui/keyboard/keyboard_controller_unittest.cc
@@ -59,7 +59,7 @@ class TestKeyboardControllerProxy : public KeyboardControllerProxy {
       : window_(new aura::Window(&delegate_)),
         input_method_(ui::CreateInputMethod(NULL,
                                             gfx::kNullAcceleratedWidget)) {
-    window_->Init(ui::LAYER_NOT_DRAWN);
+    window_->Init(aura::WINDOW_LAYER_NOT_DRAWN);
     window_->set_owned_by_parent(false);
   }
 
@@ -255,7 +255,7 @@ TEST_F(KeyboardControllerTest, ClickDoesNotFocusKeyboard) {
   const gfx::Rect& root_bounds = root_window()->bounds();
   aura::test::EventCountDelegate delegate;
   scoped_ptr<aura::Window> window(new aura::Window(&delegate));
-  window->Init(ui::LAYER_NOT_DRAWN);
+  window->Init(aura::WINDOW_LAYER_NOT_DRAWN);
   window->SetBounds(root_bounds);
   root_window()->AddChild(window.get());
   window->Show();