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

ash/wm/dock/docked_window_resizer_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 "ash/wm/dock/docked_window_resizer.h"
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shelf/shelf.h"
@@ skipping 78 matching lines @@
                   layout_manager());
       manager->Relayout();
     }
     return window;
   }
 
   aura::Window* CreateModalWindow(const gfx::Rect& bounds) {
     aura::Window* window = new aura::Window(&delegate_);
     window->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_SYSTEM);
     window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
-    window->Init(ui::LAYER_TEXTURED);
+    window->Init(aura::WINDOW_LAYER_TEXTURED);
     window->Show();
 
     if (bounds.IsEmpty()) {
       ParentWindowInPrimaryRootWindow(window);
     } else {
       gfx::Display display =
           Shell::GetScreen()->GetDisplayMatching(bounds);
       aura::Window* root = ash::Shell::GetInstance()->display_controller()->
           GetRootWindowForDisplayId(display.id());
       gfx::Point origin = bounds.origin();
@@ skipping 1316 matching lines @@
   EXPECT_TRUE(window_state->IsSnapped());
 }
 
 // Tests run twice - on both panels and normal windows
 INSTANTIATE_TEST_CASE_P(NormalOrPanel,
                         DockedWindowResizerTest,
                         testing::Values(ui::wm::WINDOW_TYPE_NORMAL,
                                         ui::wm::WINDOW_TYPE_PANEL));
 }  // namespace internal
 }  // namespace ash