aura: Remove layerless windows.

ash/display/screen_position_controller_unittest.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 "ash/display/screen_position_controller.h"
 
 #include "ash/display/display_manager.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 45 matching lines @@
 
 class ScreenPositionControllerTest : public test::AshTestBase {
  public:
   ScreenPositionControllerTest() {}
   ~ScreenPositionControllerTest() override {}
 
   void SetUp() override {
     AshTestBase::SetUp();
     window_.reset(new aura::Window(&window_delegate_));
     window_->SetType(ui::wm::WINDOW_TYPE_NORMAL);
-    window_->Init(aura::WINDOW_LAYER_NOT_DRAWN);
+    window_->Init(ui::LAYER_NOT_DRAWN);
     ParentWindowInPrimaryRootWindow(window_.get());
     window_->set_id(1);
   }
 
   void TearDown() override {
     window_.reset();
     AshTestBase::TearDown();
   }
 
   // Converts a point (x, y) in host window's coordinate to screen and
@@ skipping 280 matching lines @@
   // destroyed.
   EXPECT_FALSE(tracker.Contains(root_windows[1]));
 
   // Check that we could convert all of the mouse events we got to screen
   // coordinates.
   EXPECT_TRUE(event_handler->could_convert_to_screen());
 }
 
 }  // namespace test
 }  // namespace ash