Move ash::DisplayInfo to ui

ash/content/display/screen_orientation_controller_chromeos_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 "ash/display/screen_orientation_controller_chromeos.h"
 
 #include <memory>
 #include <vector>
 
 #include "ash/common/ash_switches.h"
-#include "ash/common/display/display_info.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/content/shell_content_state.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/ash_test_helper.h"
 #include "ash/test/content/test_shell_content_state.h"
 #include "ash/test/display_manager_test_api.h"
 #include "ash/test/test_shell_delegate.h"
 #include "ash/test/test_system_tray_delegate.h"
 #include "base/command_line.h"
 #include "chromeos/accelerometer/accelerometer_reader.h"
 #include "chromeos/accelerometer/accelerometer_types.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_browser_context.h"
 #include "third_party/WebKit/public/platform/modules/screen_orientation/WebScreenOrientationLockType.h"
 #include "ui/aura/window.h"
 #include "ui/display/display.h"
+#include "ui/display/manager/managed_display_info.h"
 #include "ui/message_center/message_center.h"
 #include "ui/views/test/webview_test_helper.h"
 #include "ui/views/view.h"
 #include "ui/views/views_delegate.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace ash {
 
 namespace {
 
 const float kDegreesToRadians = 3.1415926f / 180.0f;
 const float kMeanGravity = -9.8066f;
 
-DisplayInfo CreateDisplayInfo(int64_t id, const gfx::Rect& bounds) {
-  DisplayInfo info(id, "dummy", false);
+ui::ManagedDisplayInfo CreateDisplayInfo(int64_t id, const gfx::Rect& bounds) {
+  ui::ManagedDisplayInfo info(id, "dummy", false);
   info.SetBounds(bounds);
   return info;
 }
 
 void EnableMaximizeMode(bool enable) {
   WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       enable);
 }
 
 bool RotationLocked() {
@@ skipping 559 matching lines @@
   SetInternalDisplayRotation(display::Display::ROTATE_90);
   EXPECT_TRUE(RotationLocked());
 }
 
 // Verifies rotating an inactive Display is successful.
 TEST_F(ScreenOrientationControllerTest, RotateInactiveDisplay) {
   const int64_t kInternalDisplayId = 9;
   const int64_t kExternalDisplayId = 10;
   const display::Display::Rotation kNewRotation = display::Display::ROTATE_180;
 
-  const DisplayInfo internal_display_info =
+  const ui::ManagedDisplayInfo internal_display_info =
       CreateDisplayInfo(kInternalDisplayId, gfx::Rect(0, 0, 500, 500));
-  const DisplayInfo external_display_info =
+  const ui::ManagedDisplayInfo external_display_info =
       CreateDisplayInfo(kExternalDisplayId, gfx::Rect(1, 1, 500, 500));
 
-  std::vector<DisplayInfo> display_info_list_two_active;
+  std::vector<ui::ManagedDisplayInfo> display_info_list_two_active;
   display_info_list_two_active.push_back(internal_display_info);
   display_info_list_two_active.push_back(external_display_info);
 
-  std::vector<DisplayInfo> display_info_list_one_active;
+  std::vector<ui::ManagedDisplayInfo> display_info_list_one_active;
   display_info_list_one_active.push_back(external_display_info);
 
-  // The DisplayInfo list with two active displays needs to be added first so
+  // The ui::ManagedDisplayInfo list with two active displays needs to be added
+  // first
+  // so

[oshima, 2016/08/26 21:47:53]

nit: format

[rjkroege, 2016/08/29 22:21:59]

Done.

   // that the DisplayManager can track the |internal_display_info| as inactive
   // instead of non-existent.
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   display_manager->UpdateDisplaysWith(display_info_list_two_active);
   display_manager->UpdateDisplaysWith(display_info_list_one_active);
 
   test::ScopedSetInternalDisplayId set_internal(kInternalDisplayId);
 
   ASSERT_NE(
       kNewRotation,
       display_manager->GetDisplayInfo(kInternalDisplayId).GetActiveRotation());
 
   Shell::GetInstance()->screen_orientation_controller()->SetDisplayRotation(
       kNewRotation, display::Display::ROTATION_SOURCE_ACTIVE);
 
   EXPECT_EQ(
       kNewRotation,
       display_manager->GetDisplayInfo(kInternalDisplayId).GetActiveRotation());
 }
 
 }  // namespace ash