Rename gfx::Display/Screen to display::Display/Screen in ash

ash/display/mirror_window_controller_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/display/mirror_window_controller.h"
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/screen_util.h"
@@ skipping 209 matching lines @@
   test::ScopedSetInternalDisplayId set_internal(primary_display_id);
 
   // Chrome uses the internal display as the source display for software mirror
   // mode. Move the cursor to the external display.
   aura::Window* secondary_root_window =
       window_tree_host_manager->GetRootWindowForDisplayId(secondary_display_id);
   secondary_root_window->MoveCursorTo(gfx::Point(100, 200));
   EXPECT_EQ("300,200", env->last_mouse_location().ToString());
   test::CursorManagerTestApi cursor_test_api(shell->cursor_manager());
   EXPECT_EQ(1.0f, cursor_test_api.GetCurrentCursor().device_scale_factor());
-  EXPECT_EQ(gfx::Display::ROTATE_0, cursor_test_api.GetCurrentCursorRotation());
+  EXPECT_EQ(display::Display::ROTATE_0,
+            cursor_test_api.GetCurrentCursorRotation());
 
   shell->display_manager()->SetMultiDisplayMode(DisplayManager::MIRRORING);
   UpdateDisplay("400x400*2/r,400x400");
 
   // Entering mirror mode should have centered the cursor on the primary display
   // because the cursor's previous position is out of bounds.
   // Check real cursor's position and properties.
   EXPECT_EQ("100,100", env->last_mouse_location().ToString());
   EXPECT_EQ(2.0f, cursor_test_api.GetCurrentCursor().device_scale_factor());
-  EXPECT_EQ(gfx::Display::ROTATE_90,
+  EXPECT_EQ(display::Display::ROTATE_90,
             cursor_test_api.GetCurrentCursorRotation());
 
   // Check mirrored cursor's location.
   test::MirrorWindowTestApi test_api;
   gfx::Point hot_point = test_api.GetCursorHotPoint();
   // Rotated hot point must be (25-7, 7).
   EXPECT_EQ("18,7", test_api.GetCursorHotPoint().ToString());
   // New coordinates are not (200,200) because (200,200) is not the center of
   // the display.
   EXPECT_EQ("199,200",
@@ skipping 48 matching lines @@
 
 TEST_F(MirrorOnBootTest, MAYBE_MirrorOnBoot) {
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   EXPECT_TRUE(display_manager->IsInMirrorMode());
   RunAllPendingInMessageLoop();
   test::MirrorWindowTestApi test_api;
   EXPECT_TRUE(test_api.GetHost());
 }
 
 }  // namespace ash