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

ui/views/corewm/transient_window_manager_unittest.cc

 // Copyright 2014 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/views/corewm/transient_window_manager.h"
 
 #include "ui/aura/client/visibility_client.h"
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/test/test_windows.h"
@@ skipping 13 matching lines @@
  public:
   TransientWindowManagerTest() {}
   virtual ~TransientWindowManagerTest() {}
 
  protected:
   // Creates a transient window that is transient to |parent|.
   Window* CreateTransientChild(int id, Window* parent) {
     Window* window = new Window(NULL);
     window->set_id(id);
     window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
-    window->Init(ui::LAYER_TEXTURED);
+    window->Init(aura::WINDOW_LAYER_TEXTURED);
     aura::client::ParentWindowWithContext(window, GetContext(), gfx::Rect());
     AddTransientChild(parent, window);
     return window;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TransientWindowManagerTest);
 };
 
 // Various assertions for transient children.
@@ skipping 205 matching lines @@
 
 }  // namespace
 
 // Verifies the delegate is notified of destruction after transients are
 // destroyed.
 TEST_F(TransientWindowManagerTest, NotifyDelegateAfterDeletingTransients) {
   std::vector<std::string> destruction_order;
 
   DestroyedTrackingDelegate parent_delegate("parent", &destruction_order);
   scoped_ptr<Window> parent(new Window(&parent_delegate));
-  parent->Init(ui::LAYER_NOT_DRAWN);
+  parent->Init(aura::WINDOW_LAYER_NOT_DRAWN);
 
   DestroyedTrackingDelegate transient_delegate("transient", &destruction_order);
   Window* transient = new Window(&transient_delegate);  // Owned by |parent|.
-  transient->Init(ui::LAYER_NOT_DRAWN);
+  transient->Init(aura::WINDOW_LAYER_NOT_DRAWN);
   AddTransientChild(parent.get(), transient);
   parent.reset();
 
   ASSERT_EQ(2u, destruction_order.size());
   EXPECT_EQ("transient", destruction_order[0]);
   EXPECT_EQ("parent", destruction_order[1]);
 }
 
 TEST_F(TransientWindowManagerTest, StackTransientsWhoseLayersHaveNoDelegate) {
   // Create a window with several transients, then a couple windows on top.
@@ skipping 293 matching lines @@
   EXPECT_EQ(root->children()[3], window3.get());
   ASSERT_EQ(4u, root->layer()->children().size());
   EXPECT_EQ(root->layer()->children()[0], window2->layer());
   EXPECT_EQ(root->layer()->children()[1], transient2->layer());
   EXPECT_EQ(root->layer()->children()[2], window1->layer());
   EXPECT_EQ(root->layer()->children()[3], window3->layer());
 }
 
 }  // namespace corewm
 }  // namespace views