Move ash::DisplayInfo to ui

ash/system/web_notification/ash_popup_alignment_delegate_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/common/system/web_notification/ash_popup_alignment_delegate.h"
 
 #include <utility>
 #include <vector>
 
 #include "ash/common/shelf/shelf_types.h"
@@ skipping 206 matching lines @@
   const gfx::Rect toast_size(0, 0, 10, 10);
   UpdateDisplay("600x600");
   int origin_x = alignment_delegate()->GetToastOriginX(toast_size);
   int baseline = alignment_delegate()->GetBaseLine();
 
   // Emulate the docked mode; enter to an extended mode, then invoke
   // OnNativeDisplaysChanged() with the info for the secondary display only.
   UpdateDisplay("600x600,800x800");
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
 
-  std::vector<DisplayInfo> new_info;
+  std::vector<ui::DisplayInfo> new_info;
   new_info.push_back(
       display_manager->GetDisplayInfo(display_manager->GetDisplayAt(1u).id()));
   display_manager->OnNativeDisplaysChanged(new_info);
 
   EXPECT_LT(origin_x, alignment_delegate()->GetToastOriginX(toast_size));
   EXPECT_LT(baseline, alignment_delegate()->GetBaseLine());
 }
 
 TEST_F(AshPopupAlignmentDelegateTest, TrayHeight) {
   const gfx::Rect toast_size(0, 0, 10, 10);
@@ skipping 69 matching lines @@
   shelf->SetVirtualKeyboardBoundsForTesting(keyboard_bounds);
   int keyboard_baseline = alignment_delegate()->GetBaseLine();
   EXPECT_NE(baseline, keyboard_baseline);
   EXPECT_GT(keyboard_bounds.y(), keyboard_baseline);
 
   shelf->SetVirtualKeyboardBoundsForTesting(gfx::Rect());
   EXPECT_EQ(baseline, alignment_delegate()->GetBaseLine());
 }
 
 }  // namespace ash