Remove ui/gfx/screen_type_delegate.h

ash/test/display_manager_test_api.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 "ash/test/display_manager_test_api.h"
 
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_info.h"
@@ skipping 41 matching lines @@
   }
   return display_info_list;
 }
 
 }  // namespace
 
 // static
 bool DisplayManagerTestApi::TestIfMouseWarpsAt(
     ui::test::EventGenerator& event_generator,
     const gfx::Point& point_in_screen) {
-  aura::Window* context = Shell::GetAllRootWindows()[0];
   DCHECK(!Shell::GetInstance()->display_manager()->IsInUnifiedMode());
   static_cast<ExtendedMouseWarpController*>(
       Shell::GetInstance()
           ->mouse_cursor_filter()
           ->mouse_warp_controller_for_test())
       ->allow_non_native_event_for_test();
-  gfx::Screen* screen = gfx::Screen::GetScreenFor(context);
+  gfx::Screen* screen = gfx::Screen::GetScreen();
   gfx::Display original_display =
       screen->GetDisplayNearestPoint(point_in_screen);
   event_generator.MoveMouseTo(point_in_screen);
   return original_display.id() !=
          screen->GetDisplayNearestPoint(
                    aura::Env::GetInstance()->last_mouse_location())
              .id();
 }
 
 DisplayManagerTestApi::DisplayManagerTestApi()
@@ skipping 79 matching lines @@
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   const DisplayInfo& info = display_manager->GetDisplayInfo(display_id);
   DisplayMode mode;
   if (!GetDisplayModeForResolution(info, resolution, &mode))
     return false;
   return display_manager->SetDisplayMode(display_id, mode);
 }
 
 }  // namespace test
 }  // namespace ash