Remove ui/gfx/screen_type_delegate.h

ui/views/controls/button/custom_button_unittest.cc

Index: ui/views/controls/button/custom_button_unittest.cc
diff --git a/ui/views/controls/button/custom_button_unittest.cc b/ui/views/controls/button/custom_button_unittest.cc
index 41de3466d8f388672007120b832da0cc41e57715..0ff9f9513546bbb90ca0d368c92de3af7774f945 100644
--- a/ui/views/controls/button/custom_button_unittest.cc
+++ b/ui/views/controls/button/custom_button_unittest.cc
@@ -443,8 +443,7 @@ TEST_F(CustomButtonTest, AsCustomButton) {
 // Note: Ink drop is not hidden upon release because CustomButton descendants
 // may enter a different ink drop state.
 TEST_F(CustomButtonTest, ButtonClickTogglesInkDrop) {
-  gfx::Point old_cursor = gfx::Screen::GetScreenFor(
-      widget()->GetNativeView())->GetCursorScreenPoint();
+  gfx::Point old_cursor = gfx::Screen::GetScreen()->GetCursorScreenPoint();
   CreateButtonWithInkDrop();
 
   ui::test::EventGenerator generator(GetContext(), widget()->GetNativeWindow());
@@ -459,8 +458,7 @@ TEST_F(CustomButtonTest, ButtonClickTogglesInkDrop) {
 
 // Tests that pressing a button shows and releasing capture hides ink drop.
 TEST_F(CustomButtonTest, CaptureLossHidesInkDrop) {
-  gfx::Point old_cursor = gfx::Screen::GetScreenFor(
-      widget()->GetNativeView())->GetCursorScreenPoint();
+  gfx::Point old_cursor = gfx::Screen::GetScreen()->GetCursorScreenPoint();
   CreateButtonWithInkDrop();
 
   ui::test::EventGenerator generator(GetContext(), widget()->GetNativeWindow());