Remove ui/gfx/screen_type_delegate.h

ui/views/controls/button/custom_button_unittest.cc

 // Copyright (c) 2012 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 "ui/views/controls/button/custom_button.h"
 
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/layout.h"
@@ skipping 425 matching lines @@
 
   Textfield textfield;
   EXPECT_FALSE(CustomButton::AsCustomButton(&textfield));
 }
 
 // Tests that pressing a button shows the ink drop and releasing the button
 // does not hide the ink drop.
 // 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());
   generator.set_current_location(gfx::Point(50, 50));
   generator.PressLeftButton();
   EXPECT_TRUE(ink_shown());
   EXPECT_FALSE(ink_hidden());
 
   generator.ReleaseLeftButton();
   EXPECT_FALSE(ink_hidden());
 }
 
 // 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());
   generator.set_current_location(gfx::Point(50, 50));
   generator.PressLeftButton();
   EXPECT_TRUE(ink_shown());
   EXPECT_FALSE(ink_hidden());
 
   widget()->SetCapture(button());
   widget()->ReleaseCapture();
   EXPECT_TRUE(ink_hidden());
 }
 
 }  // namespace views