Remove ui/gfx/screen_type_delegate.h

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 72a87fca19f7963d2c266a48d06b647d664adcc4..3d31e988db9e03aa8ef54aaa4b79a1f549b2cf22 100644
--- a/components/metrics/ui/screen_info_metrics_provider.cc
+++ b/components/metrics/ui/screen_info_metrics_provider.cc
@@ -78,17 +78,15 @@ void ScreenInfoMetricsProvider::ProvideSystemProfileMetrics(
 }
 
 gfx::Size ScreenInfoMetricsProvider::GetScreenSize() const {
-  return gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().GetSizeInPixel();
+  return gfx::Screen::GetScreen()->GetPrimaryDisplay().GetSizeInPixel();
 }
 
 float ScreenInfoMetricsProvider::GetScreenDeviceScaleFactor() const {
-  return gfx::Screen::GetNativeScreen()->
-      GetPrimaryDisplay().device_scale_factor();
+  return gfx::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor();
 }
 
 int ScreenInfoMetricsProvider::GetScreenCount() const {
-  // TODO(scottmg): NativeScreen maybe wrong. http://crbug.com/133312
-  return gfx::Screen::GetNativeScreen()->GetNumDisplays();
+  return gfx::Screen::GetScreen()->GetNumDisplays();
 }
 
 }  // namespace metrics