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

ash/system/overview/overview_button_tray_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/system/overview/overview_button_tray.h"
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/rotator/screen_rotation_animator.h"
@@ skipping 226 matching lines @@
   std::unique_ptr<ui::ScopedAnimationDurationScaleMode> hide_duration(
       new ui::ScopedAnimationDurationScaleMode(
           ui::ScopedAnimationDurationScaleMode::SLOW_DURATION));
   GetTray()->SetVisible(false);
 
   // ScreenRotationAnimator copies the current layers, and deletes them upon
   // completion. Allow its animation to complete first.
   std::unique_ptr<ui::ScopedAnimationDurationScaleMode> rotate_duration(
       new ui::ScopedAnimationDurationScaleMode(
           ui::ScopedAnimationDurationScaleMode::ZERO_DURATION));
-  ash::ScreenRotationAnimator(gfx::Display::InternalDisplayId())
-      .Rotate(gfx::Display::ROTATE_270, gfx::Display::ROTATION_SOURCE_ACTIVE);
+  ash::ScreenRotationAnimator(display::Display::InternalDisplayId())
+      .Rotate(display::Display::ROTATE_270,
+              display::Display::ROTATION_SOURCE_ACTIVE);
 
   RunAllPendingInMessageLoop();
   EXPECT_FALSE(GetTray()->visible());
 }
 
 // Tests that the overview button becomes visible when the user enters
 // maximize mode with a system modal window open, and that it hides once
 // the user exits maximize mode.
 TEST_F(OverviewButtonTrayTest, VisibilityChangesForSystemModalWindow) {
   // TODO(jonross): When CreateTestWindow*() have been unified, use the
@@ skipping 10 matching lines @@
       ->maximize_mode_controller()
       ->EnableMaximizeModeWindowManager(true);
   EXPECT_TRUE(GetTray()->visible());
   Shell::GetInstance()
       ->maximize_mode_controller()
       ->EnableMaximizeModeWindowManager(false);
   EXPECT_FALSE(GetTray()->visible());
 }
 
 }  // namespace ash