Remove ui/gfx/screen_type_delegate.h

components/metrics/ui/screen_info_metrics_provider.cc

 // Copyright 2015 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 "components/metrics/ui/screen_info_metrics_provider.h"
 
 #include "build/build_config.h"
 #include "components/metrics/proto/system_profile.pb.h"
 #include "ui/gfx/screen.h"
 
@@ skipping 60 matching lines @@
   hardware->set_primary_screen_height(display_size.height());
   hardware->set_primary_screen_scale_factor(GetScreenDeviceScaleFactor());
   hardware->set_screen_count(GetScreenCount());
 
 #if defined(OS_WIN)
   WriteScreenDPIInformationProto(hardware);
 #endif
 }
 
 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