Remove ui/gfx/screen_type_delegate.h

ash/shelf/shelf_widget_unittest.cc

 // Copyright (c) 2013 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 "ash/shelf/shelf_widget.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_button.h"
 #include "ash/shelf/shelf_layout_manager.h"
@@ skipping 24 matching lines @@
 }
 
 } // namespace
 
 typedef test::AshTestBase ShelfWidgetTest;
 
 void TestLauncherAlignment(aura::Window* root,
                            ShelfAlignment alignment,
                            const std::string& expected) {
   Shell::GetInstance()->SetShelfAlignment(alignment, root);
-  gfx::Screen* screen = gfx::Screen::GetScreenFor(root);
+  gfx::Screen* screen = gfx::Screen::GetScreen();
   EXPECT_EQ(expected,
             screen->GetDisplayNearestWindow(root).work_area().ToString());
 }
 
 TEST_F(ShelfWidgetTest, TestAlignment) {
   Shelf* shelf = Shelf::ForPrimaryDisplay();
   UpdateDisplay("400x400");
   ASSERT_TRUE(shelf);
   {
     SCOPED_TRACE("Single Bottom");
@@ skipping 246 matching lines @@
   {
     gfx::Point event_location(20, shelf_bounds.y() - 1);
     ui::TouchEvent touch(ui::ET_TOUCH_PRESSED, event_location, 0,
                          ui::EventTimeForNow());
     EXPECT_EQ(shelf_widget->GetNativeWindow(),
               targeter->FindTargetForEvent(root, &touch));
   }
 }
 
 }  // namespace ash