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

ash/display/display_color_manager_chromeos.cc

Index: ash/display/display_color_manager_chromeos.cc
diff --git a/ash/display/display_color_manager_chromeos.cc b/ash/display/display_color_manager_chromeos.cc
index 0f382548f312abec881ad52ecf443eecfce9be27..06406945264d0f40aa2c3163ad991b0bca62ddd4 100644
--- a/ash/display/display_color_manager_chromeos.cc
+++ b/ash/display/display_color_manager_chromeos.cc
@@ -14,9 +14,9 @@
 #include "base/threading/sequenced_worker_pool.h"
 #include "components/quirks/quirks_manager.h"
 #include "third_party/qcms/src/qcms.h"
+#include "ui/display/display.h"
 #include "ui/display/types/display_snapshot.h"
 #include "ui/display/types/gamma_ramp_rgb_entry.h"
-#include "ui/gfx/display.h"
 
 namespace ash {
 
@@ -187,7 +187,7 @@ void DisplayColorManager::ApplyDisplayColorCalibration(int64_t display_id,
 void DisplayColorManager::LoadCalibrationForDisplay(
     const ui::DisplaySnapshot* display) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  if (display->display_id() == gfx::Display::kInvalidDisplayID) {
+  if (display->display_id() == display::Display::kInvalidDisplayID) {
     LOG(WARNING) << "Trying to load calibration data for invalid display id";
     return;
   }