Move ash::DisplayInfo to ui

ash/display/root_window_transformers_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 "ash/display/root_window_transformers.h"
 
 #include <memory>
 
-#include "ash/common/display/display_info.h"
 #include "ash/common/shelf/shelf.h"
 #include "ash/common/shelf/shelf_widget.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/display_util.h"
 #include "ash/host/root_window_transformer.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/cursor_manager_test_api.h"
 #include "ash/test/display_manager_test_api.h"
 #include "ash/test/mirror_window_test_api.h"
 #include "base/synchronization/waitable_event.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tracker.h"
 #include "ui/display/display.h"
+#include "ui/display/manager/display_info.h"
 #include "ui/display/manager/display_layout.h"
 #include "ui/display/screen.h"
 #include "ui/events/event_handler.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace {
 
@@ skipping 79 matching lines @@
   return Shell::GetInstance()
       ->display_manager()
       ->GetDisplayInfo(id)
       .GetEffectiveUIScale();
 }
 
 std::unique_ptr<RootWindowTransformer>
 CreateCurrentRootWindowTransformerForMirroring() {
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   DCHECK(display_manager->IsInMirrorMode());
-  const DisplayInfo& mirror_display_info =
+  const ui::DisplayInfo& mirror_display_info =
       display_manager->GetDisplayInfo(display_manager->mirroring_display_id());
-  const DisplayInfo& source_display_info = display_manager->GetDisplayInfo(
+  const ui::DisplayInfo& source_display_info = display_manager->GetDisplayInfo(
       display::Screen::GetScreen()->GetPrimaryDisplay().id());
   return std::unique_ptr<RootWindowTransformer>(
       CreateRootWindowTransformerForMirroredDisplay(source_display_info,
                                                     mirror_display_info));
 }
 
 }  // namespace
 
 typedef test::AshTestBase RootWindowTransformersTest;
 
@@ skipping 287 matching lines @@
   // Y margin must be margin is (500 - 500/400 * 200) / 2 = 125.
   EXPECT_EQ("0,125,0,125", transformer->GetHostInsets().ToString());
 
   UpdateDisplay("200x400,500x500");
   // The aspect ratio is flipped, so X margin is now 125.
   transformer = CreateCurrentRootWindowTransformerForMirroring();
   EXPECT_EQ("125,0,125,0", transformer->GetHostInsets().ToString());
 }
 
 }  // namespace ash