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

ui/keyboard/keyboard_controller_unittest.cc

 // Copyright (c) 2013 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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/client/focus_client.h"
@@ skipping 41 matching lines @@
   aura::Window* root_;
   DISALLOW_COPY_AND_ASSIGN(TestFocusController);
 };
 
 class TestKeyboardControllerProxy : public KeyboardControllerProxy {
  public:
   TestKeyboardControllerProxy()
       : 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);
   }
 
   virtual ~TestKeyboardControllerProxy() {
     // Destroy the window before the delegate.
     window_.reset();
   }
 
   // Overridden from KeyboardControllerProxy:
   virtual aura::Window* GetKeyboardWindow() OVERRIDE { return window_.get(); }
@@ skipping 175 matching lines @@
   // The KeyboardController's LayoutManager shouldn't let this happen
   proxy()->GetKeyboardWindow()->SetBounds(new_bounds);
   ASSERT_EQ(before_bounds, proxy()->GetKeyboardWindow()->bounds());
 }
 
 // Tests that tapping/clicking inside the keyboard does not give it focus.
 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();
   window->Focus();
 
   aura::Window* keyboard_container(controller()->GetContainerWindow());
   keyboard_container->SetBounds(root_bounds);
 
   root_window()->AddChild(keyboard_container);
   keyboard_container->Show();
@@ skipping 164 matching lines @@
 
   EXPECT_TRUE(keyboard_container->IsVisible());
 
   input_method->SetFocusedTextInputClient(&no_input_client);
   // Keyboard should not hide itself after lost focus.
   EXPECT_TRUE(keyboard_container->IsVisible());
   EXPECT_FALSE(WillHideKeyboard());
 }
 
 }  // namespace keyboard