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

ui/aura/test/test_windows.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 "ui/aura/test/test_windows.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
@@ skipping 27 matching lines @@
 }
 
 Window* CreateTestWindowWithDelegateAndType(WindowDelegate* delegate,
                                             ui::wm::WindowType type,
                                             int id,
                                             const gfx::Rect& bounds,
                                             Window* parent) {
   Window* window = new Window(delegate);
   window->set_id(id);
   window->SetType(type);
-  window->Init(ui::LAYER_TEXTURED);
+  window->Init(aura::WINDOW_LAYER_TEXTURED);
   window->SetBounds(bounds);
   window->Show();
   if (parent)
     parent->AddChild(window);
   window->SetProperty(aura::client::kCanMaximizeKey, true);
   return window;
 }
 
 template <typename T>
 bool ObjectIsAbove(T* upper, T* lower) {
@@ skipping 21 matching lines @@
        i != parent->children().end(); ++i) {
     if (!result.empty())
       result += " ";
     result += base::IntToString((*i)->id());
   }
   return result;
 }
 
 }  // namespace test
 }  // namespace aura