Split //ui/display and create //ui/display/manager.

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 <memory>
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/shell_test_api.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window_tracker.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/layout.h"
-#include "ui/display/manager/display_layout.h"
+#include "ui/display/display_layout.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/screen.h"
 #include "ui/events/test/event_generator.h"
 
 #if defined(OS_WIN)
 // TODO(scottmg): RootWindow doesn't get resized immediately on Windows
 // Ash. http://crbug.com/247916.
 #define MAYBE_ConvertHostPointToScreen DISABLED_ConvertHostPointToScreen
 #define MAYBE_ConvertHostPointToScreenHiDPI \
   DISABLED_ConvertHostPointToScreenHiDPI
@@ skipping 330 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