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

chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

 // Copyright 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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 646 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TestBrowserWindowAura);
 };
 
 // Creates a test browser window which has a native window.
 scoped_ptr<TestBrowserWindowAura> CreateTestBrowserWindow(
     const Browser::CreateParams& params) {
   // Create a window.
   aura::Window* window = new aura::Window(NULL);
   window->set_id(0);
   window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
-  window->Init(ui::LAYER_TEXTURED);
+  window->Init(aura::WINDOW_LAYER_TEXTURED);
   window->Show();
 
   scoped_ptr<TestBrowserWindowAura> browser_window(
       new TestBrowserWindowAura(window));
   browser_window->CreateBrowser(params);
   return browser_window.Pass();
 }
 
 // A views delegate which allows creating shell windows.
 class TestViewsDelegateForAppTest : public views::TestViewsDelegate {
@@ skipping 45 matching lines @@
 };
 
 // A V1 windowed application.
 class V1App : public TestBrowserWindow {
  public:
   V1App(Profile* profile, const std::string& app_name) {
     // Create a window.
     native_window_.reset(new aura::Window(NULL));
     native_window_->set_id(0);
     native_window_->SetType(ui::wm::WINDOW_TYPE_POPUP);
-    native_window_->Init(ui::LAYER_TEXTURED);
+    native_window_->Init(aura::WINDOW_LAYER_TEXTURED);
     native_window_->Show();
 
     Browser::CreateParams params = Browser::CreateParams::CreateForApp(
         Browser::TYPE_POPUP,
         kCrxAppPrefix + app_name,
         gfx::Rect(),
         profile,
         chrome::HOST_DESKTOP_TYPE_ASH);
     params.window = this;
     browser_.reset(new Browser(params));
@@ skipping 1995 matching lines @@
 
   EXPECT_EQ(1, app_icon_loader->fetch_count());
   ASSERT_EQ(initial_size + 1, model_->items().size());
   EXPECT_TRUE(launcher_controller_->IsAppPinned("1"));
   EXPECT_FALSE(launcher_controller_->IsAppPinned("0"));
   EXPECT_EQ(ash::TYPE_APP_SHORTCUT, model_->items()[app_index].type);
 
   launcher_controller_->UnpinAppWithID("1");
   ASSERT_EQ(initial_size, model_->items().size());
 }