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

components/metrics/ui/screen_info_metrics_provider.cc

Index: components/metrics/ui/screen_info_metrics_provider.cc
diff --git a/components/metrics/ui/screen_info_metrics_provider.cc b/components/metrics/ui/screen_info_metrics_provider.cc
index 3d31e988db9e03aa8ef54aaa4b79a1f549b2cf22..8c4b0dcdc5d459a6ffef314a4ab89a6ecdcc6e05 100644
--- a/components/metrics/ui/screen_info_metrics_provider.cc
+++ b/components/metrics/ui/screen_info_metrics_provider.cc
@@ -6,7 +6,7 @@
 
 #include "build/build_config.h"
 #include "components/metrics/proto/system_profile.pb.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/screen.h"
 
 namespace metrics {
 
@@ -78,15 +78,17 @@ void ScreenInfoMetricsProvider::ProvideSystemProfileMetrics(
 }
 
 gfx::Size ScreenInfoMetricsProvider::GetScreenSize() const {
-  return gfx::Screen::GetScreen()->GetPrimaryDisplay().GetSizeInPixel();
+  return display::Screen::GetScreen()->GetPrimaryDisplay().GetSizeInPixel();
 }
 
 float ScreenInfoMetricsProvider::GetScreenDeviceScaleFactor() const {
-  return gfx::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor();
+  return display::Screen::GetScreen()
+      ->GetPrimaryDisplay()
+      .device_scale_factor();
 }
 
 int ScreenInfoMetricsProvider::GetScreenCount() const {
-  return gfx::Screen::GetScreen()->GetNumDisplays();
+  return display::Screen::GetScreen()->GetNumDisplays();
 }
 
 }  // namespace metrics