Move ash::DisplayInfo to ui

ash/touch/touch_observer_hud_unittest.cc

 // Copyright (c) 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/touch/touch_observer_hud.h"
 
 #include "ash/common/ash_switches.h"
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
@@ skipping 158 matching lines @@
   RootWindowController* GetPrimaryRootController() {
     aura::Window* root = GetPrimaryRootWindow();
     return GetRootWindowController(root);
   }
 
   RootWindowController* GetSecondaryRootController() {
     aura::Window* root = GetSecondaryRootWindow();
     return GetRootWindowController(root);
   }
 
-  DisplayInfo CreateDisplayInfo(int64_t id, const gfx::Rect& bounds) {
-    DisplayInfo info(id, base::StringPrintf("x-%" PRId64, id), false);
+  ui::DisplayInfo CreateDisplayInfo(int64_t id, const gfx::Rect& bounds) {
+    ui::DisplayInfo info(id, base::StringPrintf("x-%" PRId64, id), false);
     info.SetBounds(bounds);
     return info;
   }
 
   aura::Window* GetRootWindowForTouchHud(TouchObserverHUD* hud) {
     return hud->root_window_;
   }
 
   views::Widget* GetWidgetForTouchHud(TouchObserverHUD* hud) {
     return hud->widget_;
   }
 
   int64_t internal_display_id_;
   int64_t external_display_id_;
   int64_t mirrored_display_id_;
-  DisplayInfo internal_display_info_;
-  DisplayInfo external_display_info_;
-  DisplayInfo mirrored_display_info_;
+  ui::DisplayInfo internal_display_info_;
+  ui::DisplayInfo external_display_info_;
+  ui::DisplayInfo mirrored_display_info_;
 
-  std::vector<DisplayInfo> display_info_list_;
+  std::vector<ui::DisplayInfo> display_info_list_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchHudTestBase);
 };
 
 class TouchHudDebugTest : public TouchHudTestBase {
  public:
   TouchHudDebugTest() {}
   ~TouchHudDebugTest() override {}
 
   void SetUp() override {
@@ skipping 402 matching lines @@
 
   SendTouchEventToInternalHud(ui::ET_TOUCH_PRESSED, gfx::Point(10, 10), 1);
   EXPECT_EQ(1, GetInternalTouchPointsCount());
 
   // Disabling projection touch HUD shoud remove it without crashing.
   DisableTouchHudProjection();
   EXPECT_EQ(NULL, GetInternalTouchHudProjection());
 }
 
 }  // namespace ash