Move ash::DisplayInfo to ui

ui/display/manager/display_info_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/common/display/display_info.h"
+#include "ui/display/manager/display_info.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace ash {
+namespace ui {
 namespace {
 
 std::string GetModeSizeInDIP(const gfx::Size& size,
                              float device_scale_factor,
                              float ui_scale,
                              bool is_internal) {
   scoped_refptr<ManagedDisplayMode> mode = new ManagedDisplayMode(
       size, 0.0 /* refresh_rate */, false /* interlaced */, false /* native */,
       ui_scale, device_scale_factor);
   return mode->GetSizeInDIP(is_internal).ToString();
@@ skipping 117 matching lines @@
   EXPECT_EQ(10, info.input_devices()[0]);
   EXPECT_EQ(11, info.input_devices()[1]);
 
   DisplayInfo copy_info = DisplayInfo::CreateFromSpecWithID("200x100", 10);
   copy_info.Copy(info);
   EXPECT_EQ(2u, copy_info.input_devices().size());
   copy_info.ClearInputDevices();
   EXPECT_EQ(0u, copy_info.input_devices().size());
 }
 
-}  // namespace ash
+}  // namespace ui