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

ash/system/chromeos/rotation/tray_rotation_lock_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/chromeos/rotation/tray_rotation_lock.h"
 
 #include <memory>
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
@@ skipping 226 matching lines @@
   default_view()->OnGestureEvent(&tap);
   EXPECT_TRUE(screen_orientation_controller->rotation_locked());
   EXPECT_TRUE(tray_view()->visible());
 
   maximize_mode_controller->EnableMaximizeModeWindowManager(false);
 }
 
 // Tests that when the tray is created without the internal display being known,
 // that it will still display correctly once the internal display is known.
 TEST_F(TrayRotationLockTest, InternalDisplayNotAvailableAtCreation) {
-  int64_t internal_display_id = gfx::Display::InternalDisplayId();
+  int64_t internal_display_id = display::Display::InternalDisplayId();
   TearDownViews();
-  gfx::Display::SetInternalDisplayId(gfx::Display::kInvalidDisplayID);
+  display::Display::SetInternalDisplayId(display::Display::kInvalidDisplayID);
 
   std::unique_ptr<TrayRotationLock> tray(new TrayRotationLock(
       StatusAreaWidgetTestHelper::GetStatusAreaWidget()->system_tray()));
 
-  gfx::Display::SetInternalDisplayId(internal_display_id);
+  display::Display::SetInternalDisplayId(internal_display_id);
   std::unique_ptr<views::View> tray_view(CreateTrayView(tray.get()));
   std::unique_ptr<views::View> default_view(tray->CreateDefaultView(
       StatusAreaWidgetTestHelper::GetUserLoginStatus()));
   EXPECT_TRUE(default_view);
   Shell::GetInstance()
       ->maximize_mode_controller()
       ->EnableMaximizeModeWindowManager(true);
   EXPECT_TRUE(default_view->visible());
 }
 
 // Tests that when the tray view is deleted, while TrayRotationLock has not been
 // deleted, that updates to the rotation lock state do not crash.
 TEST_F(TrayRotationLockTest, LockUpdatedDuringDesctruction) {
   Shell::GetInstance()
       ->maximize_mode_controller()
       ->EnableMaximizeModeWindowManager(true);
   DestroyTrayView();
   Shell::GetInstance()->screen_orientation_controller()->SetRotationLocked(
       true);
   Shell::GetInstance()
       ->maximize_mode_controller()
       ->EnableMaximizeModeWindowManager(false);
 }
 
 }  // namespace ash